fixed problem with non-working equalizer

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5521 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 10 insertions, 3 deletions

diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp
index 72988044c..f13921984 100644
--- a/src/qmmp/outputwriter.cpp
+++ b/src/qmmp/outputwriter.cpp
@@ -74,7 +74,6 @@ OutputWriter::OutputWriter (QObject* parent) : QThread (parent)
     m_useEq = false;
     m_muted = false;
     m_settings = QmmpSettings::instance();
-    connect(m_settings,SIGNAL(eqSettingsChanged()), SLOT(updateEqSettings()));
 }
 
 OutputWriter::~OutputWriter()
diff --git a/src/qmmp/outputwriter_p.h b/src/qmmp/outputwriter_p.h
index a19c06db6..b0f6ca0a6 100644
--- a/src/qmmp/outputwriter_p.h
+++ b/src/qmmp/outputwriter_p.h
@@ -104,8 +104,6 @@ public:
      * Returns sample size in bytes.
      */
     int sampleSize() const;
-
-private slots:
     void updateEqSettings();
 
 private:
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 6d76ff591..6e08148a6 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -49,6 +49,7 @@ QmmpAudioEngine::QmmpAudioEngine(QObject *parent)
     m_replayGain = new ReplayGain;
     m_settings = QmmpSettings::instance();
     connect(m_settings,SIGNAL(replayGainSettingsChanged()), SLOT(updateReplayGainSettings()));
+    connect(m_settings, SIGNAL(eqSettingsChanged()), SLOT(updateEqSettings()));
     updateReplayGainSettings();
     reset();
     m_instance = this;
@@ -330,6 +331,14 @@ void QmmpAudioEngine::updateReplayGainSettings()
     mutex()->unlock();
 }
 
+void QmmpAudioEngine::updateEqSettings()
+{
+    mutex()->lock();
+    if(m_output)
+        m_output->updateEqSettings();
+    mutex()->unlock();
+}
+
 void QmmpAudioEngine::run()
 {
     mutex()->lock ();
diff --git a/src/qmmp/qmmpaudioengine_p.h b/src/qmmp/qmmpaudioengine_p.h
index fcde45283..6748d1a2e 100644
--- a/src/qmmp/qmmpaudioengine_p.h
+++ b/src/qmmp/qmmpaudioengine_p.h
@@ -61,6 +61,7 @@ public:
 private slots:
     void finish();
     void updateReplayGainSettings();
+    void updateEqSettings();
 
 private:
     void run();