From b0781c7c02dfd8a0f2b2e87d6c705e35a05b78a6 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 11 Jul 2020 10:40:59 +0200 Subject: [PATCH] put fader settings load/store in separate functions --- src/main.cpp | 3 +- src/settings.cpp | 212 ++++++++++++++++++++++------------------------- src/settings.h | 3 + 3 files changed, 105 insertions(+), 113 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 274a08d4..1c45b4cc 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -532,7 +532,8 @@ int main ( int argc, char** argv ) { tsConsole << "Qt5 requires a windowing system to paint a JPEG image; image will use SVG" << endl; } - + + // Application/GUI setup --------------------------------------------------- // Application object #ifdef HEADLESS diff --git a/src/settings.cpp b/src/settings.cpp index 5b357fd8..c2976bbb 100755 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -226,70 +226,6 @@ void CClientSettings::ReadFromXML ( const QDomDocument& IniXMLDocument ) QString ( "ipaddress%1" ).arg ( iIdx ), "" ); } - // stored fader tags - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - vecStoredFaderTags[iIdx] = FromBase64ToString ( - GetIniSetting ( IniXMLDocument, "client", - QString ( "storedfadertag%1_base64" ).arg ( iIdx ), "" ) ); - } - - // stored fader levels - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - if ( GetNumericIniSet ( IniXMLDocument, "client", - QString ( "storedfaderlevel%1" ).arg ( iIdx ), - 0, AUD_MIX_FADER_MAX, iValue ) ) - { - vecStoredFaderLevels[iIdx] = iValue; - } - } - - // stored pan values - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - if ( GetNumericIniSet ( IniXMLDocument, "client", - QString ( "storedpanvalue%1" ).arg ( iIdx ), - 0, AUD_MIX_PAN_MAX, iValue ) ) - { - vecStoredPanValues[iIdx] = iValue; - } - } - - // stored fader solo state - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - if ( GetFlagIniSet ( IniXMLDocument, "client", - QString ( "storedfaderissolo%1" ).arg ( iIdx ), - bValue ) ) - { - vecStoredFaderIsSolo[iIdx] = bValue; - } - } - - // stored fader muted state - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - if ( GetFlagIniSet ( IniXMLDocument, "client", - QString ( "storedfaderismute%1" ).arg ( iIdx ), - bValue ) ) - { - vecStoredFaderIsMute[iIdx] = bValue; - } - } - - // stored fader group ID - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - // note that we only apply valid group numbers here - if ( GetNumericIniSet ( IniXMLDocument, "client", - QString ( "storedgroupid%1" ).arg ( iIdx ), - 0, MAX_NUM_FADER_GROUPS - 1, iValue ) ) - { - vecStoredFaderGroupID[iIdx] = iValue; - } - } - // new client level if ( GetNumericIniSet ( IniXMLDocument, "client", "newclientlevel", 0, 100, iValue ) ) @@ -547,6 +483,65 @@ if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) ) { bWindowWasShownConnect = bValue; } + + // fader settings + ReadFaderSettingsFromXML ( IniXMLDocument ); +} + +void CClientSettings::ReadFaderSettingsFromXML ( const QDomDocument& IniXMLDocument ) +{ + int iIdx; + int iValue; + bool bValue; + + for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) + { + // stored fader tags + vecStoredFaderTags[iIdx] = FromBase64ToString ( + GetIniSetting ( IniXMLDocument, "client", + QString ( "storedfadertag%1_base64" ).arg ( iIdx ), "" ) ); + + // stored fader levels + if ( GetNumericIniSet ( IniXMLDocument, "client", + QString ( "storedfaderlevel%1" ).arg ( iIdx ), + 0, AUD_MIX_FADER_MAX, iValue ) ) + { + vecStoredFaderLevels[iIdx] = iValue; + } + + // stored pan values + if ( GetNumericIniSet ( IniXMLDocument, "client", + QString ( "storedpanvalue%1" ).arg ( iIdx ), + 0, AUD_MIX_PAN_MAX, iValue ) ) + { + vecStoredPanValues[iIdx] = iValue; + } + + // stored fader solo state + if ( GetFlagIniSet ( IniXMLDocument, "client", + QString ( "storedfaderissolo%1" ).arg ( iIdx ), + bValue ) ) + { + vecStoredFaderIsSolo[iIdx] = bValue; + } + + // stored fader muted state + if ( GetFlagIniSet ( IniXMLDocument, "client", + QString ( "storedfaderismute%1" ).arg ( iIdx ), + bValue ) ) + { + vecStoredFaderIsMute[iIdx] = bValue; + } + + // stored fader group ID + // note that we only apply valid group numbers here + if ( GetNumericIniSet ( IniXMLDocument, "client", + QString ( "storedgroupid%1" ).arg ( iIdx ), + 0, MAX_NUM_FADER_GROUPS - 1, iValue ) ) + { + vecStoredFaderGroupID[iIdx] = iValue; + } + } } void CClientSettings::WriteToXML ( QDomDocument& IniXMLDocument ) @@ -561,54 +556,6 @@ void CClientSettings::WriteToXML ( QDomDocument& IniXMLDocument ) vstrIPAddress[iIdx] ); } - // stored fader tags - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - PutIniSetting ( IniXMLDocument, "client", - QString ( "storedfadertag%1_base64" ).arg ( iIdx ), - ToBase64 ( vecStoredFaderTags[iIdx] ) ); - } - - // stored fader levels - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - SetNumericIniSet ( IniXMLDocument, "client", - QString ( "storedfaderlevel%1" ).arg ( iIdx ), - vecStoredFaderLevels[iIdx] ); - } - - // stored pan values - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - SetNumericIniSet ( IniXMLDocument, "client", - QString ( "storedpanvalue%1" ).arg ( iIdx ), - vecStoredPanValues[iIdx] ); - } - - // stored fader solo states - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - SetFlagIniSet ( IniXMLDocument, "client", - QString ( "storedfaderissolo%1" ).arg ( iIdx ), - vecStoredFaderIsSolo[iIdx] != 0 ); - } - - // stored fader muted states - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - SetFlagIniSet ( IniXMLDocument, "client", - QString ( "storedfaderismute%1" ).arg ( iIdx ), - vecStoredFaderIsMute[iIdx] != 0 ); - } - - // stored fader group ID - for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) - { - SetNumericIniSet ( IniXMLDocument, "client", - QString ( "storedgroupid%1" ).arg ( iIdx ), - vecStoredFaderGroupID[iIdx] ); - } - // new client level SetNumericIniSet ( IniXMLDocument, "client", "newclientlevel", iNewClientFaderLevel ); @@ -752,6 +699,47 @@ void CClientSettings::WriteToXML ( QDomDocument& IniXMLDocument ) // visibility state of the connect window SetFlagIniSet ( IniXMLDocument, "client", "winviscon", bWindowWasShownConnect ); + + // fader settings + WriteFaderSettingsToXML ( IniXMLDocument ); +} + +void CClientSettings::WriteFaderSettingsToXML ( QDomDocument& IniXMLDocument ) +{ + int iIdx; + + for ( iIdx = 0; iIdx < MAX_NUM_STORED_FADER_SETTINGS; iIdx++ ) + { + // stored fader tags + PutIniSetting ( IniXMLDocument, "client", + QString ( "storedfadertag%1_base64" ).arg ( iIdx ), + ToBase64 ( vecStoredFaderTags[iIdx] ) ); + + // stored fader levels + SetNumericIniSet ( IniXMLDocument, "client", + QString ( "storedfaderlevel%1" ).arg ( iIdx ), + vecStoredFaderLevels[iIdx] ); + + // stored pan values + SetNumericIniSet ( IniXMLDocument, "client", + QString ( "storedpanvalue%1" ).arg ( iIdx ), + vecStoredPanValues[iIdx] ); + + // stored fader solo states + SetFlagIniSet ( IniXMLDocument, "client", + QString ( "storedfaderissolo%1" ).arg ( iIdx ), + vecStoredFaderIsSolo[iIdx] != 0 ); + + // stored fader muted states + SetFlagIniSet ( IniXMLDocument, "client", + QString ( "storedfaderismute%1" ).arg ( iIdx ), + vecStoredFaderIsMute[iIdx] != 0 ); + + // stored fader group ID + SetNumericIniSet ( IniXMLDocument, "client", + QString ( "storedgroupid%1" ).arg ( iIdx ), + vecStoredFaderGroupID[iIdx] ); + } } diff --git a/src/settings.h b/src/settings.h index 0c1d9122..3e05c3e2 100755 --- a/src/settings.h +++ b/src/settings.h @@ -164,6 +164,9 @@ protected: virtual void ReadFromXML ( const QDomDocument& IniXMLDocument ) override; virtual void WriteToXML ( QDomDocument& IniXMLDocument ) override; + void ReadFaderSettingsFromXML ( const QDomDocument& IniXMLDocument ); + void WriteFaderSettingsToXML ( QDomDocument& IniXMLDocument ); + CClient* pClient; };