Changeset 176 for smplayer/trunk/src/audioequalizer.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/audioequalizer.cpp (modified) (5 diffs)

smplayer/trunk/src/audioequalizer.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -41 +41 @@
                 eq[n]->setIcon( QPixmap() );
                 eq[n]->sliderWidget()->setRange(-120, 120);
+                eq[n]->sliderWidget()->setTracking(false);
+                connect(eq[n], SIGNAL(valueChanged(int)), this, SLOT(updatePresetCombo()));
                 bl->addWidget(eq[n]);
         }
@@ -229 +231 @@
 
 void AudioEqualizer::reset() {
-        for (int n = 0; n < 10; n++) {
-                eq[n]->setValue(0);
-        }
+        setValues(preset_list[Flat]);
         presets_combo->setCurrentIndex(presets_combo->findData(Flat));
 }
@@ -262 +262 @@
 
         for (int n = 0; n < 10; n++) {
+                eq[n]->blockSignals(true);
                 eq[n]->setValue(l[n].toInt());
-        }
+                eq[n]->blockSignals(false);
+        }
+
+        emit valuesChanged(l);
 }
 
@@ -288 +292 @@
         }
         emit applyClicked( l );
+}
+
+void AudioEqualizer::updatePresetCombo() {
+        qDebug("AudioEqualizer::updatePresetCombo");
+
+        AudioEqualizerList l;
+        for (int n = 0; n < 10; n++) {
+                l << eq[n]->value();
+        }
+
+        int p = findPreset(l);
+        int index = presets_combo->findData(p);
+        if (index != 1) {
+                presets_combo->setCurrentIndex(index);
+        }
 }