fixed replay gain debug output

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

3 files changed, 9 insertions, 5 deletions

diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index e43b9da8f..dd8e57c25 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -628,11 +628,11 @@ void QmmpAudioEngine::prepareEffects(Decoder *d)
         m_replayGain = new ReplayGain();
         m_replayGain->configure(m_ap.sampleRate(), m_ap.channelMap());
         m_effects << m_replayGain;
-        m_replayGain->setReplayGainInfo(d->replayGainInfo());
         m_replayGain->updateSettings(m_settings->replayGainMode(),
                                      m_settings->replayGainPreamp(),
                                      m_settings->replayGainDefaultGain(),
                                      m_settings->replayGainPreventClipping());
+        m_replayGain->setReplayGainInfo(d->replayGainInfo());
     }
     //channel order converter
     if(m_ap.channelMap() != m_ap.channelMap().remaped())
diff --git a/src/qmmp/replaygain.cpp b/src/qmmp/replaygain.cpp
index dc036e39e..275fcb14e 100644
--- a/src/qmmp/replaygain.cpp
+++ b/src/qmmp/replaygain.cpp
@@ -30,6 +30,7 @@ ReplayGain::ReplayGain()
     m_default_gain = 0.0;
     m_prevent_clipping = false;
     m_disabled = true;
+    m_update = false;
 }
 
 ReplayGain::~ReplayGain()
@@ -48,6 +49,8 @@ void ReplayGain::setReplayGainInfo(const QMap<Qmmp::ReplayGainKey, double> &info
                m_info[Qmmp::REPLAYGAIN_ALBUM_PEAK]);
         qDebug("ReplayGain: scale=%f", m_scale);
     }
+    else
+        qDebug("ReplayGain: disabled");
 }
 
 void ReplayGain::applyEffect(Buffer *b)
@@ -74,7 +77,9 @@ void ReplayGain::updateSettings(QmmpSettings::ReplayGainMode mode, double preamp
     m_preamp = preamp;
     m_default_gain = default_gain;
     m_prevent_clipping = clip;
-    setReplayGainInfo(m_info);
+    if(m_update)
+        setReplayGainInfo(m_info);
+    m_update = true;
 }
 
 void ReplayGain::updateScale()
@@ -94,7 +99,6 @@ void ReplayGain::updateScale()
         break;
     case QmmpSettings::REPLAYGAIN_DISABLED:
         m_scale = 1.0;
-        qDebug("ReplayGain: disabled");
         return;
     }
     if(m_scale == 1.0)
@@ -104,6 +108,5 @@ void ReplayGain::updateScale()
         m_scale = m_scale*peak > 1.0 ? 1.0 / peak : m_scale;
     m_scale = qMin(m_scale, 5.6234); // +15 dB
     m_scale = qMax(m_scale, 0.1778);  // -15 dB*/
-    if((m_disabled = (m_scale == 1.0)))
-        qDebug("ReplayGain: disabled");
+    m_disabled = (m_scale == 1.0);
 }
diff --git a/src/qmmp/replaygain_p.h b/src/qmmp/replaygain_p.h
index d9f03c796..a578b1d7c 100644
--- a/src/qmmp/replaygain_p.h
+++ b/src/qmmp/replaygain_p.h
@@ -50,6 +50,7 @@ private:
     double m_default_gain;
     bool m_prevent_clipping;
     bool m_disabled;
+    bool m_update;
 };
 
 #endif // REPLAYGAIN_H