Broadcast Reconnect

build/depends.py

@@ -675,6 +675,7 @@ def sources(self, build):
                    "preferences/dialog/dlgprefwaveform.cpp",
                    "preferences/settingsmanager.cpp",
                    "preferences/replaygainsettings.cpp",
+                   "preferences/broadcastsettings.cpp",
                    "preferences/upgrade.cpp",
                    "preferences/dlgpreferencepage.cpp",
 

src/analyzer/analyzerbeats.cpp

@@ -38,9 +38,8 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
         return false;
     }
 
-    bool bPreferencesBeatDetectionEnabled = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(BPM_CONFIG_KEY, BPM_DETECTION_ENABLED)).toInt());
+    bool bPreferencesBeatDetectionEnabled = m_pConfig->getValue<bool>(
+            ConfigKey(BPM_CONFIG_KEY, BPM_DETECTION_ENABLED));
     if (!bPreferencesBeatDetectionEnabled) {
         qDebug() << "Beat calculation is deactivated";
         return false;
@@ -52,8 +51,8 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
         return false;
     }
 
-    bool allow_above = static_cast<bool>(m_pConfig->getValueString(
-        ConfigKey(BPM_CONFIG_KEY, BPM_ABOVE_RANGE_ENABLED)).toInt());
+    bool allow_above = m_pConfig->getValue<bool>(
+        ConfigKey(BPM_CONFIG_KEY, BPM_ABOVE_RANGE_ENABLED));
     if (allow_above) {
         m_iMinBpm = 0;
         m_iMaxBpm = 9999;
@@ -62,23 +61,19 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
         m_iMaxBpm = m_pConfig->getValueString(ConfigKey(BPM_CONFIG_KEY, BPM_RANGE_END)).toInt();
     }
 
-    m_bPreferencesFixedTempo = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(BPM_CONFIG_KEY, BPM_FIXED_TEMPO_ASSUMPTION)).toInt());
-    m_bPreferencesOffsetCorrection = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(BPM_CONFIG_KEY, BPM_FIXED_TEMPO_OFFSET_CORRECTION)).toInt());
-    m_bPreferencesReanalyzeOldBpm = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(BPM_CONFIG_KEY, BPM_REANALYZE_WHEN_SETTINGS_CHANGE)).toInt());
-    m_bPreferencesFastAnalysis = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(BPM_CONFIG_KEY, BPM_FAST_ANALYSIS_ENABLED)).toInt());
+    m_bPreferencesFixedTempo = m_pConfig->getValue<bool>(
+            ConfigKey(BPM_CONFIG_KEY, BPM_FIXED_TEMPO_ASSUMPTION));
+    m_bPreferencesOffsetCorrection = m_pConfig->getValue<bool>(
+            ConfigKey(BPM_CONFIG_KEY, BPM_FIXED_TEMPO_OFFSET_CORRECTION));
+    m_bPreferencesReanalyzeOldBpm = m_pConfig->getValue<bool>(
+            ConfigKey(BPM_CONFIG_KEY, BPM_REANALYZE_WHEN_SETTINGS_CHANGE));
+    m_bPreferencesFastAnalysis = m_pConfig->getValue<bool>(
+            ConfigKey(BPM_CONFIG_KEY, BPM_FAST_ANALYSIS_ENABLED));
 
     QString library = m_pConfig->getValueString(
-        ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_BEAT_LIBRARY));
+            ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_BEAT_LIBRARY));
     QString pluginID = m_pConfig->getValueString(
-        ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_BEAT_PLUGIN_ID));
+            ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_BEAT_PLUGIN_ID));
 
     m_pluginId = pluginID;
     m_iSampleRate = sampleRate;
@@ -110,8 +105,8 @@ bool AnalyzerBeats::isDisabledOrLoadStoredSuccess(TrackPointer tio) const {
     int iMinBpm;
     int iMaxBpm;
 
-    bool allow_above = static_cast<bool>(m_pConfig->getValueString(
-        ConfigKey(BPM_CONFIG_KEY, BPM_ABOVE_RANGE_ENABLED)).toInt());
+    bool allow_above = m_pConfig->getValue<bool>(
+        ConfigKey(BPM_CONFIG_KEY, BPM_ABOVE_RANGE_ENABLED));
     if (allow_above) {
         iMinBpm = 0;
         iMaxBpm = 9999;

src/analyzer/analyzerkey.cpp

@@ -29,25 +29,23 @@ bool AnalyzerKey::initialize(TrackPointer tio, int sampleRate, int totalSamples)
         return false;
     }
 
-    m_bPreferencesKeyDetectionEnabled = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(KEY_CONFIG_KEY, KEY_DETECTION_ENABLED)).toInt());
+    m_bPreferencesKeyDetectionEnabled = m_pConfig->getValue<bool>(
+            ConfigKey(KEY_CONFIG_KEY, KEY_DETECTION_ENABLED));
     if (!m_bPreferencesKeyDetectionEnabled) {
         qDebug() << "Key detection is deactivated";
         return false;
     }
 
-    m_bPreferencesFastAnalysisEnabled = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(KEY_CONFIG_KEY, KEY_FAST_ANALYSIS)).toInt());
-    QString library = m_pConfig->getValueString(
-        ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_LIBRARY),
-        // TODO(rryan) this default really doesn't belong here.
-        "libmixxxminimal");
-    QString pluginID = m_pConfig->getValueString(
-        ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_PLUGIN_ID),
-        // TODO(rryan) this default really doesn't belong here.
-        VAMP_ANALYZER_KEY_DEFAULT_PLUGIN_ID);
+    m_bPreferencesFastAnalysisEnabled = m_pConfig->getValue<bool>(
+            ConfigKey(KEY_CONFIG_KEY, KEY_FAST_ANALYSIS));
+    QString library = m_pConfig->getValue(
+            ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_LIBRARY),
+            // TODO(rryan) this default really doesn't belong here.
+            "libmixxxminimal");
+    QString pluginID = m_pConfig->getValue(
+            ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_PLUGIN_ID),
+            // TODO(rryan) this default really doesn't belong here.
+            VAMP_ANALYZER_KEY_DEFAULT_PLUGIN_ID);
 
     m_pluginId = pluginID;
     m_iSampleRate = sampleRate;
@@ -77,14 +75,13 @@ bool AnalyzerKey::initialize(TrackPointer tio, int sampleRate, int totalSamples)
 }
 
 bool AnalyzerKey::isDisabledOrLoadStoredSuccess(TrackPointer tio) const {
-    bool bPreferencesFastAnalysisEnabled = static_cast<bool>(
-        m_pConfig->getValueString(
-            ConfigKey(KEY_CONFIG_KEY, KEY_FAST_ANALYSIS)).toInt());
+    bool bPreferencesFastAnalysisEnabled = m_pConfig->getValue<bool>(
+            ConfigKey(KEY_CONFIG_KEY, KEY_FAST_ANALYSIS));
 
     QString library = m_pConfig->getValueString(
-        ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_LIBRARY));
+            ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_LIBRARY));
     QString pluginID = m_pConfig->getValueString(
-        ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_PLUGIN_ID));
+            ConfigKey(VAMP_CONFIG_KEY, VAMP_ANALYZER_KEY_PLUGIN_ID));
 
     // TODO(rryan): This belongs elsewhere.
     if (library.isEmpty() || library.isNull())

src/encoder/encodervorbis.cpp

@@ -122,7 +122,11 @@ void EncoderVorbis::writePage() {
             result = ogg_stream_flush(&m_oggs, &m_oggpage);
             if (result == 0)
                 break;
-            m_pCallback->write(m_oggpage.header, m_oggpage.body, m_oggpage.header_len, m_oggpage.body_len);
+            m_pCallback->write(
+                    m_oggpage.header,
+                    m_oggpage.body,
+                    m_oggpage.header_len,
+                    m_oggpage.body_len);
         }
         m_header_write = false;
     }

src/engine/cuecontrol.cpp

@@ -242,8 +242,8 @@ void CueControl::trackLoaded(TrackPointer pNewTrack, TrackPointer pOldTrack) {
 
     // If cue recall is ON in the prefs, then we're supposed to seek to the cue
     // point on song load. Note that [Controls],cueRecall == 0 corresponds to "ON", not OFF.
-    bool cueRecall = (getConfig()->getValueString(
-                ConfigKey("[Controls]","CueRecall"), "0").toInt() == 0);
+    bool cueRecall = (getConfig()->getValue(
+           ConfigKey("[Controls]","CueRecall"), 0) == 0);
     if (cueRecall && (cuePoint >= 0.0)) {
         seekExact(cuePoint);
     } else if (!(m_pVinylControlEnabled->get() &&

src/engine/enginemaster.cpp

@@ -74,8 +74,8 @@ EngineMaster::EngineMaster(UserSettingsPointer pConfig,
     m_pMasterSync = new EngineSync(pConfig);
 
     // The last-used bpm value is saved in the destructor of EngineSync.
-    double default_bpm = pConfig->getValueString(ConfigKey("[InternalClock]", "bpm"),
-                                                 "124.0").toDouble();
+    double default_bpm = pConfig->getValue(
+            ConfigKey("[InternalClock]", "bpm"), 124.0);
     ControlObject::getControl(ConfigKey("[InternalClock]","bpm"))->set(default_bpm);
 
     // Crossfader

src/engine/enginetalkoverducking.cpp

@@ -14,7 +14,7 @@ EngineTalkoverDucking::EngineTalkoverDucking(
 
     m_pDuckStrength = new ControlPotmeter(ConfigKey(m_group, "duckStrength"), 0.0, 1.0);
     m_pDuckStrength->set(
-            m_pConfig->getValueString(ConfigKey(m_group, "duckStrength"), "90").toDouble() / 100);
+            m_pConfig->getValue<double>(ConfigKey(m_group, "duckStrength"), 90) / 100);
     connect(m_pDuckStrength, SIGNAL(valueChanged(double)),
             this, SLOT(slotDuckStrengthChanged(double)),
             Qt::DirectConnection);
@@ -32,8 +32,8 @@ EngineTalkoverDucking::EngineTalkoverDucking(
     m_pTalkoverDucking->setButtonMode(ControlPushButton::TOGGLE);
     m_pTalkoverDucking->setStates(3);
     m_pTalkoverDucking->set(
-            m_pConfig->getValueString(
-                ConfigKey(m_group, "duckMode"), QString::number(AUTO)).toDouble());
+            m_pConfig->getValue<double>(
+                ConfigKey(m_group, "duckMode"), AUTO));
     connect(m_pTalkoverDucking, SIGNAL(valueChanged(double)),
             this, SLOT(slotDuckModeChanged(double)),
             Qt::DirectConnection);