mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-04 22:33:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer

Browse Source 
Conflicts:
	src/core/FxMixer.cpp
	src/gui/FxMixerView.cpp
This commit is contained in:
Tobias Doerffel
2014-01-17 19:56:51 +01:00
parent dddf5eb61c 4b5b0fa4fa
commit c868d691ab
8 changed files with 913 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/FxMixerView.cpp
View File

@@ -458,17 +458,18 @@ void FxMixerView::updateFaders()
const float fall_off = 1.2;
if( m->m_fxChannels[i]->m_peakLeft > opl )
{
m_fxChannelViews[i]->m_fader->setPeak_L(
m->m_fxChannels[i]->m_peakLeft );
m_fxChannelViews[i]->m_fader->setPeak_L( m->m_fxChannels[i]->m_peakLeft );
m->m_fxChannels[i]->m_peakLeft = 0;
}
else
{
m_fxChannelViews[i]->m_fader->setPeak_L( opl/fall_off );
}
if( m->m_fxChannels[i]->m_peakRight > opr )
{
m_fxChannelViews[i]->m_fader->setPeak_R(
m->m_fxChannels[i]->m_peakRight );
m_fxChannelViews[i]->m_fader->setPeak_R( m->m_fxChannels[i]->m_peakRight );
m->m_fxChannels[i]->m_peakRight = 0;
}
else
{