eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed the outstanding bug

Browse source
This commit is contained in:
Volker Fischer 2013-02-28 20:50:09 +00:00
parent 471fb0c6ae
commit b8759620ef
1 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/audiomixerboard.cpp
View file

@ -342,7 +342,7 @@ QString CChannelFader::GenFaderText ( const CChannelInfo& ChanInfo )
CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) : CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) :
QGroupBox ( parent ), QGroupBox ( parent ),
vecStoredFaderTags ( MAX_NUM_STORED_FADER_LEVELS, "" ), vecStoredFaderTags ( MAX_NUM_STORED_FADER_LEVELS, "" ),
vecStoredFaderGains ( MAX_NUM_STORED_FADER_LEVELS, AUD_MIX_FADER_MAX ) vecStoredFaderLevels ( MAX_NUM_STORED_FADER_LEVELS, AUD_MIX_FADER_MAX )
{ {
// set title text (default: no server given) // set title text (default: no server given)
SetServerName ( "" ); SetServerName ( "" );
@ -551,6 +551,8 @@ void CAudioMixerBoard::StoreFaderLevel ( CChannelFader* pChanFader )
if ( pChanFader->IsVisible() && if ( pChanFader->IsVisible() &&
!pChanFader->GetReceivedName().isEmpty() ) !pChanFader->GetReceivedName().isEmpty() )
{ {
CVector<int> viOldStoredFaderLevels ( vecStoredFaderLevels );
// init temporary list count (may be overwritten later on) // init temporary list count (may be overwritten later on)
int iTempListCnt = 0; int iTempListCnt = 0;
@ -559,27 +561,16 @@ void CAudioMixerBoard::StoreFaderLevel ( CChannelFader* pChanFader )
const bool bNewLevelIsDefaultFaderLevel = const bool bNewLevelIsDefaultFaderLevel =
( pChanFader->GetFaderLevel() == AUD_MIX_FADER_MAX ); ( pChanFader->GetFaderLevel() == AUD_MIX_FADER_MAX );
// add the new entry at the top of the list and get the index of the old
// position of the entry in the list (in case it was there before)
// TODO this does not work for removing an entry, i.e., if bNewLevelIsDefaultFaderLevel is true!!!!!
// -> fix this bug!!!
const int iOldIdx =
vecStoredFaderTags.AddStringFiFoWithCompare ( pChanFader->GetReceivedName() );
CVector<int> viOldFaderGains ( vecStoredFaderGains );
// if the new value is not the default value, put it on the top of the // if the new value is not the default value, put it on the top of the
// list, otherwise just remove it from the list // list, otherwise just remove it from the list
const int iOldIdx =
vecStoredFaderTags.StringFiFoWithCompare ( pChanFader->GetReceivedName(),
!bNewLevelIsDefaultFaderLevel );
if ( !bNewLevelIsDefaultFaderLevel ) if ( !bNewLevelIsDefaultFaderLevel )
{ {
// current fader level is at the top of the list // current fader level is at the top of the list
vecStoredFaderGains[0] = pChanFader->GetFaderLevel(); vecStoredFaderLevels[0] = pChanFader->GetFaderLevel();
iTempListCnt = 1; iTempListCnt = 1;
} }
@ -593,7 +584,7 @@ const int iOldIdx =
// index in case the entry was not present in the vector before // index in case the entry was not present in the vector before
if ( iIdx != iOldIdx ) if ( iIdx != iOldIdx )
{ {
vecStoredFaderGains[iTempListCnt] = viOldFaderGains[iIdx]; vecStoredFaderLevels[iTempListCnt] = viOldStoredFaderLevels[iIdx];
iTempListCnt++; iTempListCnt++;
} }
@ -613,7 +604,7 @@ int CAudioMixerBoard::GetStoredFaderLevel ( const CChannelInfo& ChanInfo )
if ( !vecStoredFaderTags[iIdx].compare ( ChanInfo.strName ) ) if ( !vecStoredFaderTags[iIdx].compare ( ChanInfo.strName ) )
{ {
// use stored level value (return it) // use stored level value (return it)
return vecStoredFaderGains[iIdx]; return vecStoredFaderLevels[iIdx];
} }
} }
} }