summaryrefslogtreecommitdiffstats
path: root/src/engine/enginevumeter.cpp
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2014-02-11 21:50:33 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2014-02-11 21:50:33 +0100
commit2cf40921f3fc88d0ae1f45686410f178f037885b (patch)
treeb4252faabf1438cd2de88922f20f40ce35a953e8 /src/engine/enginevumeter.cpp
parent6f09a87b609573379bed96da12eb411de7cf4250 (diff)
reset vuMeter when EnginAux is not active
Diffstat (limited to 'src/engine/enginevumeter.cpp')
-rw-r--r--src/engine/enginevumeter.cpp21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp
index 1acfe07fb8..ab8eecaeaf 100644
--- a/src/engine/enginevumeter.cpp
+++ b/src/engine/enginevumeter.cpp
@@ -26,20 +26,13 @@ EngineVuMeter::EngineVuMeter(const char* group) {
// The VUmeter widget is controlled via a controlpotmeter, which means
// that it should react on the setValue(int) signal.
m_ctrlVuMeter = new ControlPotmeter(ConfigKey(group, "VuMeter"), 0., 1.);
- m_ctrlVuMeter->set(0);
// left channel VU meter
m_ctrlVuMeterL = new ControlPotmeter(ConfigKey(group, "VuMeterL"), 0., 1.);
- m_ctrlVuMeterL->set(0);
// right channel VU meter
m_ctrlVuMeterR = new ControlPotmeter(ConfigKey(group, "VuMeterR"), 0., 1.);
- m_ctrlVuMeterR->set(0);
// Initialize the calculation:
- m_iSamplesCalculated = 0;
- m_fRMSvolumeL = 0;
- m_fRMSvolumeSumL = 0;
- m_fRMSvolumeR = 0;
- m_fRMSvolumeSumR = 0;
+ reset();
}
EngineVuMeter::~EngineVuMeter()
@@ -96,3 +89,15 @@ void EngineVuMeter::doSmooth(FLOAT_TYPE &currentVolume, FLOAT_TYPE newVolume)
if (currentVolume > 1.0)
currentVolume=1.0;
}
+
+void EngineVuMeter::reset() {
+ m_ctrlVuMeter->set(0);
+ m_ctrlVuMeterL->set(0);
+ m_ctrlVuMeterR->set(0);
+ m_iSamplesCalculated = 0;
+ m_fRMSvolumeL = 0;
+ m_fRMSvolumeSumL = 0;
+ m_fRMSvolumeR = 0;
+ m_fRMSvolumeSumR = 0;
+}
+