diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2014-04-12 17:21:16 +0200 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2014-04-12 17:21:16 +0200 |
commit | c803518895e3e814c330098e94daaeedb2b83eec (patch) | |
tree | 5a65faae15811b48ca4dd3f86af15c324242a62f /src/engine/enginevumeter.cpp | |
parent | 5b5a29b473b253eaa080f97f32a25325da7939d7 (diff) |
moved preak indicator init to reset()
Diffstat (limited to 'src/engine/enginevumeter.cpp')
-rw-r--r-- | src/engine/enginevumeter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp index a121e9a95e..1de97b83aa 100644 --- a/src/engine/enginevumeter.cpp +++ b/src/engine/enginevumeter.cpp @@ -33,9 +33,6 @@ EngineVuMeter::EngineVuMeter(const char* group) { //Used controlpotmeter as the example used it :/ perhaps someone with more knowledge could use something more suitable... m_ctrlClipping = new ControlPotmeter(ConfigKey(group, "PeakIndicator"), 0., 1.); - m_ctrlClipping->set(0); - m_duration = 0; - // Initialize the calculation: reset(); } @@ -93,8 +90,7 @@ void EngineVuMeter::process(const CSAMPLE* pIn, CSAMPLE*, const int iBufferSize) if (m_ctrlClipping->get() == 1.) { m_ctrlClipping->set(0.); } - } - else { + } else { m_duration--; } } @@ -120,9 +116,12 @@ void EngineVuMeter::reset() { m_ctrlVuMeter->set(0); m_ctrlVuMeterL->set(0); m_ctrlVuMeterR->set(0); + m_ctrlClipping->set(0); + m_iSamplesCalculated = 0; m_fRMSvolumeL = 0; m_fRMSvolumeSumL = 0; m_fRMSvolumeR = 0; m_fRMSvolumeSumR = 0; + m_duration = 0; } |