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

CVector<bool> does not work -> implement a workaround with int type

Browse source
This commit is contained in:
Volker Fischer 2014-01-19 15:02:25 +00:00
parent 180837f70b
commit 7320b0a4cc
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/audiomixerboard.cpp
View file

@ -548,7 +548,7 @@ void CAudioMixerBoard::StoreFaderSettings ( CChannelFader* pChanFader )
!pChanFader->GetReceivedName().isEmpty() ) !pChanFader->GetReceivedName().isEmpty() )
{ {
CVector<int> viOldStoredFaderLevels ( vecStoredFaderLevels ); CVector<int> viOldStoredFaderLevels ( vecStoredFaderLevels );
CVector<bool> vbOldStoredFaderIsSolo ( vecStoredFaderIsSolo ); CVector<int> vbOldStoredFaderIsSolo ( vecStoredFaderIsSolo );
// init temporary list count (may be overwritten later on) // init temporary list count (may be overwritten later on)
int iTempListCnt = 0; int iTempListCnt = 0;
@ -610,7 +610,7 @@ bool CAudioMixerBoard::GetStoredFaderSettings ( const CChannelInfo& ChanInfo,
{ {
// copy stored settings values // copy stored settings values
iStoredFaderLevel = vecStoredFaderLevels[iIdx]; iStoredFaderLevel = vecStoredFaderLevels[iIdx];
bStoredFaderIsSolo = vecStoredFaderIsSolo[iIdx]; bStoredFaderIsSolo = vecStoredFaderIsSolo[iIdx] != false;
// values found and copied, return OK // values found and copied, return OK
return true; return true;

2
src/audiomixerboard.h
View file

@ -103,7 +103,7 @@ public:
// settings // settings
CVector<QString> vecStoredFaderTags; CVector<QString> vecStoredFaderTags;
CVector<int> vecStoredFaderLevels; CVector<int> vecStoredFaderLevels;
CVector<bool> vecStoredFaderIsSolo; CVector<int> vecStoredFaderIsSolo;
protected: protected:
bool GetStoredFaderSettings ( const CChannelInfo& ChanInfo, bool GetStoredFaderSettings ( const CChannelInfo& ChanInfo,

2
src/client.h
View file

@ -269,7 +269,7 @@ public:
CChannelCoreInfo ChannelInfo; CChannelCoreInfo ChannelInfo;
CVector<QString> vecStoredFaderTags; CVector<QString> vecStoredFaderTags;
CVector<int> vecStoredFaderLevels; CVector<int> vecStoredFaderLevels;
CVector<bool> vecStoredFaderIsSolo; CVector<int> vecStoredFaderIsSolo;
// window position/state settings // window position/state settings
QByteArray vecWindowPosMain; QByteArray vecWindowPosMain;

2
src/settings.cpp
View file

@ -363,7 +363,7 @@ void CSettings::Save()
{ {
SetFlagIniSet ( IniXMLDocument, "client", SetFlagIniSet ( IniXMLDocument, "client",
QString ( "storedfaderissolo%1" ).arg ( iIdx ), QString ( "storedfaderissolo%1" ).arg ( iIdx ),
pClient->vecStoredFaderIsSolo[iIdx] ); pClient->vecStoredFaderIsSolo[iIdx] != false );
} }
// name // name