summaryrefslogtreecommitdiffstats
path: root/src/engine/enginevumeter.cpp
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2014-04-12 22:16:22 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2014-04-12 22:16:22 +0200
commit6cde9a0f80ff64a0879c64e0eb6a7f20b660b1d2 (patch)
tree951b6ac2cf9be51d721072ef9e27dcbb31fb58e5 /src/engine/enginevumeter.cpp
parent592203e4b23ff3c882cfed584f5236aa22202a7e (diff)
reduce VU sample rate to 30 to match half of common dispaly frame rate
Diffstat (limited to 'src/engine/enginevumeter.cpp')
-rw-r--r--src/engine/enginevumeter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp
index cca8e10407..d47ffe5ae1 100644
--- a/src/engine/enginevumeter.cpp
+++ b/src/engine/enginevumeter.cpp
@@ -29,9 +29,9 @@ EngineVuMeter::EngineVuMeter(const char* group) {
// that it should react on the setValue(int) signal.
m_ctrlVuMeter = new ControlPotmeter(ConfigKey(group, "VuMeter"), 0., 1.);
// left channel VU meter
- m_ctrlVuMeterL = new ControlPotmeter(ConfigKey(group, "VuMeterL"), 0., 1.);
+ m_ctrlVuMeterL = new ControlPotmeter(ConfigKey(group, "VuMeterR"), 0., 1.);
// right channel VU meter
- m_ctrlVuMeterR = new ControlPotmeter(ConfigKey(group, "VuMeterR"), 0., 1.);
+ m_ctrlVuMeterR = new ControlPotmeter(ConfigKey(group, "VuMeterL"), 0., 1.);
// Used controlpotmeter as the example used it :/ perhaps someone with more knowledge could use something more suitable...
m_ctrlPeakIndicator = new ControlPotmeter(ConfigKey(group, "PeakIndicator"), 0., 1.);
@@ -62,7 +62,7 @@ void EngineVuMeter::process(const CSAMPLE* pIn, CSAMPLE*, const int iBufferSize)
m_iSamplesCalculated += iBufferSize/2;
// Are we ready to update the VU meter?:
- if (m_iSamplesCalculated > (sampleRate/2/UPDATE_RATE)) {
+ if (m_iSamplesCalculated > (sampleRate/VU_UPDATE_RATE)) {
doSmooth(m_fRMSvolumeL, log10(SHRT_MAX * m_fRMSvolumeSumL/(m_iSamplesCalculated*1000)+1));
doSmooth(m_fRMSvolumeR, log10(SHRT_MAX * m_fRMSvolumeSumR/(m_iSamplesCalculated*1000)+1));