hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1430 from diizy/master

Browse Source 
Fix master channel peak display
This commit is contained in:
Vesa V
2014-12-10 01:30:31 +02:00
parent b39225ac6a fbc6de857a
commit ebc519c296
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/FxMixer.cpp
View File

@@ -600,9 +600,6 @@ void FxMixer::masterMix( sampleFrame * _buf )
: 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)

5
src/gui/FxMixerView.cpp
View File

@@ -503,6 +503,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();