From 4a6257a47c8c2d44f817ac447e2656a9283a242e Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 10 Dec 2014 01:28:14 +0200 Subject: [PATCH] Fix master channel peak display Fix #1427 Conflicts: src/core/FxMixer.cpp src/gui/FxMixerView.cpp --- src/core/FxMixer.cpp | 3 --- src/gui/FxMixerView.cpp | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp index d47f34c8b..7a21acb92 100644 --- a/src/core/FxMixer.cpp +++ b/src/core/FxMixer.cpp @@ -514,9 +514,6 @@ void FxMixer::masterMix( sampleFrame * _buf ) const float v = m_fxChannels[0]->m_volumeModel.value(); MixHelpers::addSanitizedMultiplied( _buf, m_fxChannels[0]->m_buffer, v, fpp ); - m_fxChannels[0]->m_peakLeft *= engine::mixer()->masterGain(); - m_fxChannels[0]->m_peakRight *= engine::mixer()->masterGain(); - // clear all channel buffers and // reset channel process state for( int i = 0; i < numChannels(); ++i) diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp index bd7df6e2f..8948e8474 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/FxMixerView.cpp @@ -480,6 +480,11 @@ void FxMixerView::clear() void FxMixerView::updateFaders() { FxMixer * m = engine::fxMixer(); + + // apply master gain + m->m_fxChannels[0]->m_peakLeft *= engine::mixer()->masterGain(); + m->m_fxChannels[0]->m_peakRight *= engine::mixer()->masterGain(); + for( int i = 0; i < m_fxChannelViews.size(); ++i ) { const float opl = m_fxChannelViews[i]->m_fader->getPeak_L();