From 7320b0a4cc7884a7ec2753d693ecbe21f78564de Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 19 Jan 2014 15:02:25 +0000 Subject: [PATCH] CVector does not work -> implement a workaround with int type --- src/audiomixerboard.cpp | 6 +++--- src/audiomixerboard.h | 2 +- src/client.h | 2 +- src/settings.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index b1d560db..265d0535 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -547,8 +547,8 @@ void CAudioMixerBoard::StoreFaderSettings ( CChannelFader* pChanFader ) if ( pChanFader->IsVisible() && !pChanFader->GetReceivedName().isEmpty() ) { - CVector viOldStoredFaderLevels ( vecStoredFaderLevels ); - CVector vbOldStoredFaderIsSolo ( vecStoredFaderIsSolo ); + CVector viOldStoredFaderLevels ( vecStoredFaderLevels ); + CVector vbOldStoredFaderIsSolo ( vecStoredFaderIsSolo ); // init temporary list count (may be overwritten later on) int iTempListCnt = 0; @@ -610,7 +610,7 @@ bool CAudioMixerBoard::GetStoredFaderSettings ( const CChannelInfo& ChanInfo, { // copy stored settings values iStoredFaderLevel = vecStoredFaderLevels[iIdx]; - bStoredFaderIsSolo = vecStoredFaderIsSolo[iIdx]; + bStoredFaderIsSolo = vecStoredFaderIsSolo[iIdx] != false; // values found and copied, return OK return true; diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h index 642a309c..854305db 100755 --- a/src/audiomixerboard.h +++ b/src/audiomixerboard.h @@ -103,7 +103,7 @@ public: // settings CVector vecStoredFaderTags; CVector vecStoredFaderLevels; - CVector vecStoredFaderIsSolo; + CVector vecStoredFaderIsSolo; protected: bool GetStoredFaderSettings ( const CChannelInfo& ChanInfo, diff --git a/src/client.h b/src/client.h index 76216727..c815fb1e 100755 --- a/src/client.h +++ b/src/client.h @@ -269,7 +269,7 @@ public: CChannelCoreInfo ChannelInfo; CVector vecStoredFaderTags; CVector vecStoredFaderLevels; - CVector vecStoredFaderIsSolo; + CVector vecStoredFaderIsSolo; // window position/state settings QByteArray vecWindowPosMain; diff --git a/src/settings.cpp b/src/settings.cpp index 7433d2fd..08542881 100755 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -363,7 +363,7 @@ void CSettings::Save() { SetFlagIniSet ( IniXMLDocument, "client", QString ( "storedfaderissolo%1" ).arg ( iIdx ), - pClient->vecStoredFaderIsSolo[iIdx] ); + pClient->vecStoredFaderIsSolo[iIdx] != false ); } // name