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

Merge pull request #2127 from Wallacoloo/FxMixer_friends

Browse Source 
Enforce tighter permissions in FxMixer
This commit is contained in:
Colin Wallace
2015-06-29 18:46:51 -07:00
parent de7ad76de6 2e010141ad
commit ebcc837b99
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/FxMixer.h
View File

@@ -211,9 +211,6 @@ private:
int m_lastSoloed;
friend class MixerWorkerThread;
friend class FxMixerView;
} ;

3
src/core/FxMixer.cpp
View File

@@ -380,6 +380,9 @@ void FxMixer::moveChannelLeft( int index )
}
}
}
// Swap positions in array
qSwap(m_fxChannels[index], m_fxChannels[index - 1]);
}

23
src/gui/FxMixerView.cpp
View File

@@ -454,11 +454,8 @@ void FxMixerView::moveChannelLeft(int index, int focusIndex)
m->moveChannelLeft( index );
// Update widgets models
m_fxChannelViews[index]->setChannelIndex( index - 1 );
m_fxChannelViews[index - 1]->setChannelIndex( index );
// Swap positions in array
qSwap(m->m_fxChannels[index], m->m_fxChannels[index - 1]);
m_fxChannelViews[index]->setChannelIndex( index );
m_fxChannelViews[index - 1]->setChannelIndex( index - 1 );
// Focus on new position
setCurrentFxLine( focusIndex );
@@ -560,28 +557,28 @@ 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();
m->effectChannel(0)->m_peakLeft *= Engine::mixer()->masterGain();
m->effectChannel(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();
const float opr = m_fxChannelViews[i]->m_fader->getPeak_R();
const float fall_off = 1.2;
if( m->m_fxChannels[i]->m_peakLeft > opl )
if( m->effectChannel(i)->m_peakLeft > opl )
{
m_fxChannelViews[i]->m_fader->setPeak_L( m->m_fxChannels[i]->m_peakLeft );
m->m_fxChannels[i]->m_peakLeft = 0;
m_fxChannelViews[i]->m_fader->setPeak_L( m->effectChannel(i)->m_peakLeft );
m->effectChannel(i)->m_peakLeft = 0;
}
else
{
m_fxChannelViews[i]->m_fader->setPeak_L( opl/fall_off );
}
if( m->m_fxChannels[i]->m_peakRight > opr )
if( m->effectChannel(i)->m_peakRight > opr )
{
m_fxChannelViews[i]->m_fader->setPeak_R( m->m_fxChannels[i]->m_peakRight );
m->m_fxChannels[i]->m_peakRight = 0;
m_fxChannelViews[i]->m_fader->setPeak_R( m->effectChannel(i)->m_peakRight );
m->effectChannel(i)->m_peakRight = 0;
}
else
{