From bd3467c95ba114d1a686481277a71b0918a56444 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Sun, 26 Mar 2017 13:02:16 +0200 Subject: [PATCH 1/4] fix default pitch slider range > 8% --- src/preferences/dialog/dlgprefcontrols.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/preferences/dialog/dlgprefcontrols.cpp b/src/preferences/dialog/dlgprefcontrols.cpp index c92237b98cb6..3024693254f5 100644 --- a/src/preferences/dialog/dlgprefcontrols.cpp +++ b/src/preferences/dialog/dlgprefcontrols.cpp @@ -99,6 +99,11 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxMainWindow * mixxx, connect(ComboBoxRateRange, SIGNAL(activated(int)), this, SLOT(slotSetRateRange(int))); + // If not present in the config, set the default value + if (!m_pConfig->exists(ConfigKey("[Controls]","RateRangePercent")) && + !m_pConfig->exists(ConfigKey("[Controls]","RateRange"))) + m_pConfig->set(ConfigKey("[Controls]","RateRangePercent"),ConfigValue(8)); + // Set default range as stored in config file if (m_pConfig->getValueString(ConfigKey("[Controls]", "RateRangePercent")).length() == 0) { // Fall back to old [Controls]RateRange From cea139acca933dc3cdd650aad2a7f51b568e54db Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 27 Mar 2017 16:46:20 +0200 Subject: [PATCH 2/4] more compact: disregard nonexistant 'RateRang' --- src/preferences/dialog/dlgprefcontrols.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/preferences/dialog/dlgprefcontrols.cpp b/src/preferences/dialog/dlgprefcontrols.cpp index 3024693254f5..ccea68e246b6 100644 --- a/src/preferences/dialog/dlgprefcontrols.cpp +++ b/src/preferences/dialog/dlgprefcontrols.cpp @@ -99,13 +99,9 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxMainWindow * mixxx, connect(ComboBoxRateRange, SIGNAL(activated(int)), this, SLOT(slotSetRateRange(int))); - // If not present in the config, set the default value - if (!m_pConfig->exists(ConfigKey("[Controls]","RateRangePercent")) && - !m_pConfig->exists(ConfigKey("[Controls]","RateRange"))) - m_pConfig->set(ConfigKey("[Controls]","RateRangePercent"),ConfigValue(8)); - // Set default range as stored in config file - if (m_pConfig->getValueString(ConfigKey("[Controls]", "RateRangePercent")).length() == 0) { + if (!m_pConfig->exists(ConfigKey("[Controls]","RateRangePercent")) || + m_pConfig->getValueString(ConfigKey("[Controls]", "RateRangePercent")).length() == 0) { // Fall back to old [Controls]RateRange if (m_pConfig->getValueString(ConfigKey("[Controls]", "RateRange")).length() == 0) { m_pConfig->set(ConfigKey("[Controls]", "RateRangePercent"), ConfigValue(8)); From d6f06e57e19c1a391df4f779384a26d88f22fc08 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 27 Mar 2017 16:50:56 +0200 Subject: [PATCH 3/4] more compact II --- src/preferences/dialog/dlgprefcontrols.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/preferences/dialog/dlgprefcontrols.cpp b/src/preferences/dialog/dlgprefcontrols.cpp index ccea68e246b6..a6b58498f4be 100644 --- a/src/preferences/dialog/dlgprefcontrols.cpp +++ b/src/preferences/dialog/dlgprefcontrols.cpp @@ -103,7 +103,8 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxMainWindow * mixxx, if (!m_pConfig->exists(ConfigKey("[Controls]","RateRangePercent")) || m_pConfig->getValueString(ConfigKey("[Controls]", "RateRangePercent")).length() == 0) { // Fall back to old [Controls]RateRange - if (m_pConfig->getValueString(ConfigKey("[Controls]", "RateRange")).length() == 0) { + if (!m_pConfig->exists(ConfigKey("[Controls]","RateRange")) || + m_pConfig->getValueString(ConfigKey("[Controls]", "RateRange")).length() == 0) { m_pConfig->set(ConfigKey("[Controls]", "RateRangePercent"), ConfigValue(8)); } else { int oldIdx = m_pConfig->getValueString(ConfigKey("[Controls]", "RateRange")).toInt(); From 2a50aca9e3cf4d4f3f2f5d962618794333097a09 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 27 Mar 2017 19:14:56 +0200 Subject: [PATCH 4/4] call slotSetRateRangePercent() --- src/preferences/dialog/dlgprefcontrols.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/preferences/dialog/dlgprefcontrols.cpp b/src/preferences/dialog/dlgprefcontrols.cpp index a6b58498f4be..1a9cdd4e25ad 100644 --- a/src/preferences/dialog/dlgprefcontrols.cpp +++ b/src/preferences/dialog/dlgprefcontrols.cpp @@ -105,7 +105,9 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxMainWindow * mixxx, // Fall back to old [Controls]RateRange if (!m_pConfig->exists(ConfigKey("[Controls]","RateRange")) || m_pConfig->getValueString(ConfigKey("[Controls]", "RateRange")).length() == 0) { - m_pConfig->set(ConfigKey("[Controls]", "RateRangePercent"), ConfigValue(8)); + int rateRangePercent = 8; + m_pConfig->set(ConfigKey("[Controls]", "RateRangePercent"), ConfigValue(rateRangePercent)); + slotSetRateRangePercent(rateRangePercent); } else { int oldIdx = m_pConfig->getValueString(ConfigKey("[Controls]", "RateRange")).toInt(); double oldRange = static_cast(oldIdx-1) / 10.0;