WebSVN – tpanel – Diff – /trunk/tconfig.cpp

 using std::cerr;
 using std::endl;
 bool TConfig::mInitialized{false};
 int TConfig::mChannel{0};
+bool TConfig::mMute{false};
 /**
  * @struct SETTINGS
  * @brief The SETTINGS struct bundles the configuration options.
+ *
     bool profiling{false};      //!< TRUE = The declaration traces meassure the time and write it to the log
     string password1;           //!< First panel password
     string password2;           //!< Second panel password
     string password3;           //!< Third panel password
     string password4;           //!< Fourth panel password
-    string systemSound;         //!< name of the set system sound played on every touch.
-    bool systemSoundState{false};   //!< TRUE = play systemsound on every touch
-    string systemSingleBeep;    //!< name of the system sound file to play a single beep.
-    string systemDoubleBeep;    //!< name of the system sound file to play a double beep.
     bool systemRotationFix{false};  //!< TRUE = Rotation is blocked and orientation sensor is ignored.
     string uuid;                //!< An UUID set automatically after first start.
     // FTP credentials
     string ftpUser;             //!< The username for FTP of the controller (default: administrator)
     string ftpPassword;         //!< The password for FTP of the controller (default: password)
     bool sip_ipv4{true};        //!< Default: TRUE, Enables or disables IPv4.
     bool sip_ipv6{true};        //!< Default: TRUE, Enables or disables IPv6. Has precedence over IPv4.
     bool sip_iphone{false};     //!< Default: FALSE, if enabled and SIP is enabled then the internal phone dialog is used.
     TConfig::SIP_FIREWALL_t sip_firewall{TConfig::SIP_NO_FIREWALL}; //!< Defines how to deal with a firewall.
     bool sip_enabled{false};    //!< By default SIP is disabled
+    // Sound settings
+    string systemSound;         //!< name of the set system sound played on every touch.
+    bool systemSoundState{false};   //!< TRUE = play systemsound on every touch
+    string systemSingleBeep;    //!< name of the system sound file to play a single beep.
+    string systemDoubleBeep;    //!< name of the system sound file to play a double beep.
+    int systemVolume{100};      //!< The set volume to use [0 ... 100]
+    int systemGain{100};        //!< The set microphone level to use [0 ... 100]
 };
 typedef struct SETTINGS settings_t;
 static settings_t localSettings;    //!< Global defines settings used in class TConfig.
     DECL_TRACER("TConfig::saveSystemSoundState(bool state)");
     localSettings.systemSoundState = state;
+}
+void TConfig::saveSingleBeepFile(const std::string& snd)
+{
+    DECL_TRACER("TConfig::saveSingleBeepFile(const std::string& snd)");
+    localSettings.systemSingleBeep = snd;
+}
+void TConfig::saveDoubleBeepFile(const std::string& snd)
+{
+    DECL_TRACER("TConfig::saveDoubleBeepFile(const std::string& snd)");
+    localSettings.systemDoubleBeep = snd;
+}
+void TConfig::saveSystemVolume(int volume)
+{
+    DECL_TRACER("TConfig::saveSystemVolume(int volume)");
+    if (volume < 0 || volume > 100)
+        return;
+    localSettings.systemVolume = volume;
+}
+void TConfig::saveSystemGain(int gain)
+{
+    DECL_TRACER("TConfig::saveSystemGain(int gain)");
+    if (gain < 0 || gain > 100)
+        return;
+    localSettings.systemGain = gain;
+}
 void TConfig::saveFtpUser(const string& user)
+{
     DECL_TRACER("TConfig::saveFtpUser(const string& user)");
     localSettings.ftpUser = user;
         lines += string("Password4=") + localSettings.password4 + "\n";
         lines += string("SystemSoundFile=") + localSettings.systemSound + "\n";
         lines += string("SystemSoundState=") + (localSettings.systemSoundState ? "ON" : "OFF") + "\n";
         lines += string("SystemSingleBeep=") + localSettings.systemSingleBeep + "\n";
         lines += string("SystemDoubleBeep=") + localSettings.systemDoubleBeep + "\n";
+        lines += "SystemVolume=" + std::to_string(localSettings.systemVolume) + "\n";
+        lines += "SystemGain=" + std::to_string(localSettings.systemGain) + "\n";
         lines += string("SystemRotationFix=") + (localSettings.systemRotationFix ? "ON" : "OFF") + "\n";
         lines += string("UUID=") + localSettings.uuid + "\n";
         // FTP credentials
         lines += string("FTPuser=") + localSettings.ftpUser + "\n";
         lines += string("FTPpassword=") + localSettings.ftpPassword + "\n";
     DECL_TRACER("TConfig::getSystemSoundState()");
     return localSettings.systemSoundState;
+}
+int TConfig::getSystemVolume()
+{
+    DECL_TRACER("TConfig::getSystemVolume()");
+    return localSettings.systemVolume;
+}
+int TConfig::getSystemGain()
+{
+    DECL_TRACER("TConfig::getSystemGain()");
+    return localSettings.systemGain;
+}
 bool TConfig::getRotationFixed()
+{
     DECL_TRACER("TConfig::getRotationFixed()");
     return localSettings.systemRotationFix;
                 localSettings.systemSoundState = isTrue(right);
             else if (caseCompare(left, "SystemSingleBeep") == 0 && !right.empty())
                 localSettings.systemSingleBeep = right;
             else if (caseCompare(left, "SystemDoubleBeep") == 0 && !right.empty())
                 localSettings.systemDoubleBeep = right;
+            else if (caseCompare(left, "SystemVolume") == 0 && !right.empty())
+            {
+                int volume = atoi(right.c_str());
+                if (volume < 0)
+                    volume = 0;
+                else if (volume > 100)
+                    volume = 100;
+                localSettings.systemVolume = volume;
+            }
+            else if (caseCompare(left, "SystemGain") == 0 && !right.empty())
+            {
+                int gain = atoi(right.c_str());
+                if (gain < 0)
+                    gain = 0;
+                else if (gain > 100)
+                    gain = 100;
+                localSettings.systemGain = gain;
+            }
             else if (caseCompare(left, "SystemRotationFix") == 0 && !right.empty())
                 localSettings.systemRotationFix = isTrue(right);
             else if (caseCompare(left, "UUID") == 0 && !right.empty())
                 localSettings.uuid = right;
             else if (caseCompare(left, "FTPuser") == 0 && !right.empty())       // FTP credentials
         MSG_INFO("    Profiling:    " << (localSettings.profiling ? "YES" : "NO"));
         MSG_INFO("    System Sound: " << localSettings.systemSound);
         MSG_INFO("    Sound state:  " << (localSettings.systemSoundState ? "ACTIVATED" : "DEACTIVATED"));
         MSG_INFO("    Single beep:  " << localSettings.systemSingleBeep);
         MSG_INFO("    Double beep:  " << localSettings.systemDoubleBeep);
+        MSG_INFO("    Volume:       " << localSettings.systemVolume);
+        MSG_INFO("    Gain:         " << localSettings.systemGain);
         MSG_INFO("    Rotation:     " << (localSettings.systemRotationFix ? "LOCKED" : "UNLOCKED"));
         MSG_INFO("    UUID:         " << localSettings.uuid);
         MSG_INFO("    FTP user:     " << localSettings.ftpUser);
         MSG_INFO("    FTP password: " << localSettings.ftpPassword);
         MSG_INFO("    FTP surface:  " << localSettings.ftpSurface);

Subversion Repositories tpanel

(root)/trunk/tconfig.cpp @ 143 – Rev 140 → 141