Skip to content

Commit

Permalink
Improve algorithm to find in use channels
Browse files Browse the repository at this point in the history 
This replaces the O(n²) approach to find channels in use with a simpler 
O(n) approach.
  • Loading branch information
@ann0see
ann0see committed Jul 22, 2022
1 parent fa204ad commit 728b2c0
Showing 1 changed file with 83 additions and 77 deletions.
160 changes: 83 additions & 77 deletions src/audiomixerboard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1210,92 +1210,98 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf

// search for channels with are already present and preserve their gain
// setting, for all other channels reset gain
for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )

// get all channels which are in use/not in use. We use the array index of vecChanInfo
// if the fader is in use, else INVALID_INDEX to specify it is not in use
int iFaderNumber[MAX_NUM_CHANNELS];

for ( int iChanID = 0; iChanID < MAX_NUM_CHANNELS; iChanID++ )
{
iFaderNumber[iChanID] = INVALID_INDEX;
}

for ( int iFader = 0; iFader < iNumConnectedClients; i++ )
{
bool bFaderIsUsed = false;
iFaderNumber[vecChanInfo[iFader].iChanID] = i;
}

for ( int iChanID = 0; iChanID < MAX_NUM_CHANNELS; iChanID++ )
{
if ( iFaderNumber[iChanID] == INVALID_INDEX )
{
// fader is not used --> hide it
// before hiding the fader, store its level (if some conditions are fulfilled)
StoreFaderSettings ( vecpChanFader[iChanID] );

for ( int j = 0; j < iNumConnectedClients; j++ )
vecpChanFader[iChanID]->Hide();
continue;
}

// current fader is used
// check if fader was already in use -> preserve gain value
if ( !vecpChanFader[iChanID]->IsVisible() )
{
// check if current fader is used
if ( vecChanInfo[j].iChanID == i )
// the fader was not in use, reset everything for new client
vecpChanFader[iChanID]->Reset();
vecAvgLevels[iChanID] = 0.0f;

// check if this is my own fader and set fader property
if ( iChanID == iMyChannelID )
{
vecpChanFader[iChanID]->SetIsMyOwnFader();
}

// set and increment the running new client counter needed for sorting (per definition:
// a fader for a new client shall always be inserted at the right-hand-side if no other
// sorting type is selected (i.e. "no sorting" is active) (#673)
vecpChanFader[iChanID]->SetRunningNewClientCnt ( iRunningNewClientCnt++ );

// show fader
vecpChanFader[iChanID]->Show();

// Set the default initial fader level. Check first that
// this is not the initialization (i.e. previously there
// were no faders visible) to avoid that our own level is
// adjusted. If we have received our own channel ID, then
// we can adjust the level even if no fader was visible.
// The fader level of 100 % is the default in the
// server, in that case we do not have to do anything here.
if ( ( !bNoFaderVisible || ( ( iMyChannelID != INVALID_INDEX ) && ( iMyChannelID != iChanID ) ) ) &&
( pSettings->iNewClientFaderLevel != 100 ) )
{
// check if fader was already in use -> preserve gain value
if ( !vecpChanFader[i]->IsVisible() )
{
// the fader was not in use, reset everything for new client
vecpChanFader[i]->Reset();
vecAvgLevels[i] = 0.0f;

// check if this is my own fader and set fader property
if ( i == iMyChannelID )
{
vecpChanFader[i]->SetIsMyOwnFader();
}

// set and increment the running new client counter needed for sorting (per definition:
// a fader for a new client shall always be inserted at the right-hand-side if no other
// sorting type is selected (i.e. "no sorting" is active) (#673)
vecpChanFader[i]->SetRunningNewClientCnt ( iRunningNewClientCnt++ );

// show fader
vecpChanFader[i]->Show();

// Set the default initial fader level. Check first that
// this is not the initialization (i.e. previously there
// were no faders visible) to avoid that our own level is
// adjusted. If we have received our own channel ID, then
// we can adjust the level even if no fader was visible.
// The fader level of 100 % is the default in the
// server, in that case we do not have to do anything here.
if ( ( !bNoFaderVisible || ( ( iMyChannelID != INVALID_INDEX ) && ( iMyChannelID != i ) ) ) &&
( pSettings->iNewClientFaderLevel != 100 ) )
{
// the value is in percent -> convert range
vecpChanFader[i]->SetFaderLevel ( pSettings->iNewClientFaderLevel / 100.0 * AUD_MIX_FADER_MAX );
}
}

// restore gain (if new name is different from the current one)
if ( vecpChanFader[i]->GetReceivedName().compare ( vecChanInfo[j].strName ) )
{
// the text has actually changed, search in the list of
// stored settings if we have a matching entry
int iStoredFaderLevel;
int iStoredPanValue;
bool bStoredFaderIsSolo;
bool bStoredFaderIsMute;
int iGroupID;

if ( GetStoredFaderSettings ( vecChanInfo[j].strName,
iStoredFaderLevel,
iStoredPanValue,
bStoredFaderIsSolo,
bStoredFaderIsMute,
iGroupID ) )
{
vecpChanFader[i]->SetFaderLevel ( iStoredFaderLevel, true ); // suppress group update
vecpChanFader[i]->SetPanValue ( iStoredPanValue );
vecpChanFader[i]->SetFaderIsSolo ( bStoredFaderIsSolo );
vecpChanFader[i]->SetFaderIsMute ( bStoredFaderIsMute );
vecpChanFader[i]->SetGroupID ( iGroupID ); // Must be the last to be set in the fader!
}
}

// set the channel infos
vecpChanFader[i]->SetChannelInfos ( vecChanInfo[j] );

bFaderIsUsed = true;
// the value is in percent -> convert range
vecpChanFader[iChanID]->SetFaderLevel ( pSettings->iNewClientFaderLevel / 100.0 * AUD_MIX_FADER_MAX );
}
}

// if current fader is not used, hide it
if ( !bFaderIsUsed )
// restore gain (if new name is different from the current one)
if ( vecpChanFader[iChanID]->GetReceivedName().compare ( vecChanInfo[iFaderNumber[iChanID]].strName ) )
{
// before hiding the fader, store its level (if some conditions are fulfilled)
StoreFaderSettings ( vecpChanFader[i] );

vecpChanFader[i]->Hide();
// the text has actually changed, search in the list of
// stored settings if we have a matching entry
int iStoredFaderLevel;
int iStoredPanValue;
bool bStoredFaderIsSolo;
bool bStoredFaderIsMute;
int iGroupID;

if ( GetStoredFaderSettings ( vecChanInfo[iFaderNumber[iChanID]].strName,
iStoredFaderLevel,
iStoredPanValue,
bStoredFaderIsSolo,
bStoredFaderIsMute,
iGroupID ) )
{
vecpChanFader[iChanID]->SetFaderLevel ( iStoredFaderLevel, true ); // suppress group update
vecpChanFader[iChanID]->SetPanValue ( iStoredPanValue );
vecpChanFader[iChanID]->SetFaderIsSolo ( bStoredFaderIsSolo );
vecpChanFader[iChanID]->SetFaderIsMute ( bStoredFaderIsMute );
vecpChanFader[iChanID]->SetGroupID ( iGroupID ); // Must be the last to be set in the fader!
}
}

// set the channel infos
vecpChanFader[iChanID]->SetChannelInfos ( vecChanInfo[iFaderNumber[iChanID]] );
}

// update the solo states since if any channel was on solo and a new client
Expand Down

0 comments on commit 728b2c0

Please sign in to comment.