Merge pull request #12399 from ronso0/pref-mixer-defaults

minor Preferences fixes
mixxxdj · Dec 6, 2023 · 8df57b3 · 8df57b3
2 parents 9eda4c3 + 8668d92
commit 8df57b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/controllers/legacycontrollermappingfilehandler.cpp b/src/controllers/legacycontrollermappingfilehandler.cpp
@@ -33,6 +33,9 @@ QFileInfo findScriptFile(std::shared_ptr<LegacyControllerMapping> mapping,
 // static
 std::shared_ptr<LegacyControllerMapping> LegacyControllerMappingFileHandler::loadMapping(
         const QFileInfo& mappingFile, const QDir& systemMappingsPath) {
+    if (mappingFile.path().isEmpty()) {
+        return nullptr;
+    }
     if (!mappingFile.exists() || !mappingFile.isReadable()) {
         qDebug() << "Mapping" << mappingFile.absoluteFilePath()
                  << "does not exist or is unreadable.";

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
@@ -439,7 +439,7 @@ void DlgPrefMixer::slotResetToDefaults() {
             EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
             SliderXFader->minimum(),
             SliderXFader->maximum());
-    SliderXFader->setValue(static_cast<int>(sliderVal));
+    SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));
 
     m_xFaderMode = MIXXX_XFADER_ADDITIVE;
     radioButtonAdditive->setChecked(true);
@@ -730,7 +730,7 @@ void DlgPrefMixer::slotUpdate() {
             EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
             SliderXFader->minimum(),
             SliderXFader->maximum());
-    SliderXFader->setValue(static_cast<int>(sliderVal + 0.5));
+    SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));
 
     m_xFaderMode = m_pConfig->getValueString(kXfaderModeKey).toInt();
     if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
@@ -905,12 +905,14 @@ void DlgPrefMixer::slotUpdateXFader() {
 
     // m_transform is in the range of 1 to 1000 while 50 % slider results
     // to ~2, which represents a medium rounded fader curve.
-    m_transform = RescalerUtils::linearToOneByX(
-                          SliderXFader->value(),
-                          SliderXFader->minimum(),
-                          SliderXFader->maximum(),
-                          EngineXfader::kTransformMax) -
+    double transform = RescalerUtils::linearToOneByX(
+                               SliderXFader->value(),
+                               SliderXFader->minimum(),
+                               SliderXFader->maximum(),
+                               EngineXfader::kTransformMax) -
             1 + EngineXfader::kTransformMin;
+    // Round to 4 decimal places to avoid round-trip offsets with default 1.0
+    m_transform = std::round(transform * 10000) / 10000;
     m_cal = EngineXfader::getPowerCalibration(m_transform);
 
     drawXfaderDisplay();

diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -94,23 +94,20 @@
              <number>0</number>
             </property>
             <property name="maximum">
-             <number>100</number>
+             <number>100000</number>
             </property>
             <property name="singleStep">
-             <number>1</number>
+             <number>1000</number>
             </property>
             <property name="pageStep">
-             <number>1</number>
+             <number>1000</number>
             </property>
             <property name="value">
-             <number>50</number>
+             <number>50000</number>
             </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="tickInterval">
-             <number>5</number>
-            </property>
            </widget>
           </item>
           <item>