Skip to content

Refactor deleteUnusedChannels in FxMixerView #5564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Spekular merged 5 commits into from
Jul 9, 2020
Merged

Refactor deleteUnusedChannels in FxMixerView #5564

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7670e10
Refactor deleteUnusedChannels in FxMixerView
Spekular Jul 7, 2020
f149d0f
Comments + style fix
Spekular Jul 7, 2020
683d3aa
Update weird deleteChannel loop
Spekular Jul 7, 2020
6fe30ae
Use vector instead of array
Spekular Jul 9, 2020
3cb8679
Merge branch 'unusedDelete' of https://github.com/Spekular/lmms into …
Spekular Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 17 additions & 27 deletions src/gui/FxMixerView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,38 +439,28 @@ void FxMixerView::deleteUnusedChannels()
tracks += Engine::getSong()->tracks();
tracks += Engine::getBBTrackContainer()->tracks();

// go through all FX Channels
for(int i = m_fxChannelViews.size()-1; i > 0; --i)
bool inUse[m_fxChannelViews.size()] = {false};

for (Track* t: tracks)
{
// check if an instrument references to the current channel
bool empty=true;
for( Track* t : tracks )
int channel = 0;
if (t->type() == Track::InstrumentTrack)
{
if( t->type() == Track::InstrumentTrack )
{
InstrumentTrack* inst = dynamic_cast<InstrumentTrack *>( t );
if( i == inst->effectChannelModel()->value(0) )
{
empty=false;
break;
}
}
else if( t->type() == Track::SampleTrack )
{
SampleTrack *strack = dynamic_cast<SampleTrack *>( t );
if( i == strack->effectChannelModel()->value(0) )
{
empty=false;
break;
}
}
InstrumentTrack* inst = dynamic_cast<InstrumentTrack *>(t);
channel = inst->effectChannelModel()->value();
}
FxChannel * ch = Engine::fxMixer()->effectChannel( i );
// delete channel if no references found
if( empty && ch->m_receives.isEmpty() )
else if (t->type() == Track::SampleTrack)
{
deleteChannel( i );
SampleTrack *strack = dynamic_cast<SampleTrack *>(t);
channel = strack->effectChannelModel()->value();
}
inUse[channel] = true;
}

for(int i = m_fxChannelViews.size()-1; i > 0; --i)
{
if(!inUse[i] && Engine::fxMixer()->effectChannel(i)->m_receives.isEmpty())
{ deleteChannel(i); }
}
}

Expand Down