refactor(preferences): use enum for QML multi-sampling mode

mixxxdj · Feb 12, 2024 · 76450d0 · 76450d0
1 parent fee2afb
commit 76450d0
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 21 deletions.
diff --git a/src/preferences/constants.h b/src/preferences/constants.h
@@ -21,6 +21,14 @@ enum class ScreenSaver {
     OnPlay = 2
 };
 
+enum class MultiSamplingMode {
+    Disabled = 0,
+    Two = 2,
+    Four = 4,
+    Eight = 8,
+    Sixteen = 16
+};
+
 } // namespace constants
 } // namespace preferences
 } // namespace mixxx
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
@@ -4,6 +4,7 @@
 #include <QList>
 #include <QLocale>
 #include <QScreen>
+#include <QVariant>
 #include <QtGlobal>
 
 #include "control/controlobject.h"
@@ -185,19 +186,28 @@ DlgPrefInterface::DlgPrefInterface(
 #ifdef MIXXX_USE_QML
     if (CmdlineArgs::Instance().isQml()) {
         multiSamplingComboBox->clear();
-        multiSamplingComboBox->addItem(tr("Disabled"), 0);
-        multiSamplingComboBox->addItem(tr("2x MSAA"), 2);
-        multiSamplingComboBox->addItem(tr("4x MSAA"), 4);
-        multiSamplingComboBox->addItem(tr("8x MSAA"), 8);
-        multiSamplingComboBox->addItem(tr("16x MSAA"), 16);
-
-        m_multiSampling = m_pConfig->getValue(ConfigKey(kPreferencesGroup, kMultiSamplingKey), 4);
-        int multiSamplingIndex = multiSamplingComboBox->findData(m_multiSampling);
+        multiSamplingComboBox->addItem(tr("Disabled"),
+                QVariant::fromValue(constants::MultiSamplingMode::Disabled));
+        multiSamplingComboBox->addItem(tr("2x MSAA"),
+                QVariant::fromValue(constants::MultiSamplingMode::Two));
+        multiSamplingComboBox->addItem(tr("4x MSAA"),
+                QVariant::fromValue(constants::MultiSamplingMode::Four));
+        multiSamplingComboBox->addItem(tr("8x MSAA"),
+                QVariant::fromValue(constants::MultiSamplingMode::Eight));
+        multiSamplingComboBox->addItem(tr("16x MSAA"),
+                QVariant::fromValue(constants::MultiSamplingMode::Sixteen));
+
+        m_multiSampling = m_pConfig->getValue<constants::MultiSamplingMode>(
+                ConfigKey(kPreferencesGroup, kMultiSamplingKey),
+                constants::MultiSamplingMode::Four);
+        int multiSamplingIndex = multiSamplingComboBox->findData(
+                static_cast<int>(m_multiSampling));
         if (multiSamplingIndex != -1) {
             multiSamplingComboBox->setCurrentIndex(multiSamplingIndex);
         } else {
-            multiSamplingComboBox->setCurrentIndex(0);
-            m_pConfig->set(ConfigKey(kPreferencesGroup, kMultiSamplingKey), ConfigValue(0));
+            multiSamplingComboBox->setCurrentIndex(0); // Disabled
+            m_pConfig->setValue(ConfigKey(kPreferencesGroup, kMultiSamplingKey),
+                    constants::MultiSamplingMode::Disabled);
         }
     } else
 #endif
@@ -328,7 +338,8 @@ void DlgPrefInterface::slotResetToDefaults() {
             static_cast<int>(constants::ScreenSaver::On)));
 
 #ifdef MIXXX_USE_QML
-    multiSamplingComboBox->setCurrentIndex(4); // 4x MSAA
+    multiSamplingComboBox->setCurrentIndex(multiSamplingComboBox->findData(
+            static_cast<int>(constants::MultiSamplingMode::Four))); // 4x MSAA
 #endif
 
 #ifdef Q_OS_IOS
@@ -429,8 +440,7 @@ void DlgPrefInterface::slotApply() {
         m_pConfig->set(ConfigKey(kConfigGroup, kSchemeKey), m_colorScheme);
     }
 
-    QString locale = ComboBoxLocale->itemData(
-            ComboBoxLocale->currentIndex()).toString();
+    QString locale = ComboBoxLocale->currentData().toString();
     m_pConfig->set(ConfigKey(kConfigGroup, kLocaleKey), locale);
 
     double scaleFactor = spinBoxScaleFactor->value() / 100;
@@ -444,19 +454,19 @@ void DlgPrefInterface::slotApply() {
     emit tooltipModeChanged(m_tooltipMode);
 
     // screensaver mode update
-    int screensaverComboBoxState = comboBoxScreensaver->itemData(
-            comboBoxScreensaver->currentIndex()).toInt();
+    int screensaverComboBoxState = comboBoxScreensaver->currentData().toInt();
     int screensaverConfiguredState = static_cast<int>(m_pScreensaverManager->status());
     if (screensaverComboBoxState != screensaverConfiguredState) {
         m_pScreensaverManager->setStatus(
                 static_cast<constants::ScreenSaver>(screensaverComboBoxState));
     }
 
 #ifdef MIXXX_USE_QML
-    int multiSampling = multiSamplingComboBox->itemData(
-                                                     multiSamplingComboBox->currentIndex())
-                                .toInt();
-    m_pConfig->set(ConfigKey(kPreferencesGroup, kMultiSamplingKey), ConfigValue(multiSampling));
+    constants::MultiSamplingMode multiSampling =
+            multiSamplingComboBox->currentData()
+                    .value<constants::MultiSamplingMode>();
+    m_pConfig->setValue<constants::MultiSamplingMode>(
+            ConfigKey(kPreferencesGroup, kMultiSamplingKey), multiSampling);
 #endif
 
     if (locale != m_localeOnUpdate || scaleFactor != m_dScaleFactor

diff --git a/src/preferences/dialog/dlgprefinterface.h b/src/preferences/dialog/dlgprefinterface.h
@@ -68,7 +68,7 @@ class DlgPrefInterface : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     QString m_colorScheme;
     QString m_colorSchemeOnUpdate;
     QString m_localeOnUpdate;
-    int m_multiSampling;
+    mixxx::preferences::constants::MultiSamplingMode m_multiSampling;
     mixxx::preferences::constants::Tooltips m_tooltipMode;
     double m_dScaleFactor;
     double m_minScaleFactor;

diff --git a/src/qml/qmlconfigproxy.cpp b/src/qml/qmlconfigproxy.cpp
@@ -2,6 +2,7 @@
 
 #include "moc_qmlconfigproxy.cpp"
 #include "preferences/colorpalettesettings.h"
+#include "preferences/constants.h"
 
 namespace {
 QVariantList paletteToQColorList(const ColorPalette& palette) {
@@ -36,7 +37,9 @@ QVariantList QmlConfigProxy::getTrackColorPalette() {
 }
 
 int QmlConfigProxy::getMultiSamplingLevel() {
-    return m_pConfig->getValue(ConfigKey(kPreferencesGroup, kMultiSamplingKey), 0);
+    return static_cast<int>(m_pConfig->getValue(
+            ConfigKey(kPreferencesGroup, kMultiSamplingKey),
+            mixxx::preferences::constants::MultiSamplingMode::Disabled));
 }
 
 // static