use enum class for QML multi-sampling mode

mixxxdj · Feb 12, 2024 · 8962aa6 · 8962aa6
1 parent 0ccbaed
commit 8962aa6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/src/preferences/constants.h b/src/preferences/constants.h
@@ -17,4 +17,12 @@ enum class ScreenSaverPreference {
     PREVENT_ON_PLAY = 2
 };
 
+enum class MultiSamplingMode {
+    DISABLED = 0,
+    TWO = 2,
+    FOUR = 4,
+    EIGHT = 8,
+    SIXTEEN = 16
+};
+
 }  // namespace mixxx
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
@@ -183,19 +183,24 @@ DlgPrefInterface::DlgPrefInterface(
 #ifdef MIXXX_USE_QML
     if (CmdlineArgs::Instance().isQml()) {
         mulitSamplingComboBox->clear();
-        mulitSamplingComboBox->addItem(tr("Disabled"), 0);
-        mulitSamplingComboBox->addItem(tr("2x MSAA"), 2);
-        mulitSamplingComboBox->addItem(tr("4x MSAA"), 4);
-        mulitSamplingComboBox->addItem(tr("8x MSAA"), 8);
-        mulitSamplingComboBox->addItem(tr("16x MSAA"), 16);
-
-        m_multiSampling = m_pConfig->getValue(ConfigKey(kPreferencesGroup, kMultiSamplingKey), 4);
-        int mulitSamplingIndex = mulitSamplingComboBox->findData(m_multiSampling);
+        mulitSamplingComboBox->addItem(tr("Disabled"), mixxx::MultiSamplingMode::DISABLED);
+        mulitSamplingComboBox->addItem(tr("2x MSAA"), mixxx::MultiSamplingMode::TWO);
+        mulitSamplingComboBox->addItem(tr("4x MSAA"), mixxx::MultiSamplingMode::FOUR);
+        mulitSamplingComboBox->addItem(tr("8x MSAA"), mixxx::MultiSamplingMode::EIGHT);
+        mulitSamplingComboBox->addItem(tr("16x MSAA"), mixxx::MultiSamplingMode::SIXTEEN);
+
+        m_multiSampling = m_pConfig->getValue(
+                ConfigKey(kPreferencesGroup, kMultiSamplingKey),
+                static_cast<int>(mixxx::MultiSamplingMode::FOUR));
+        int mulitSamplingIndex = mulitSamplingComboBox->findData(
+                static_cast<mixxx::MultiSamplingMode::>(m_multiSampling));
         if (mulitSamplingIndex != -1) {
             mulitSamplingComboBox->setCurrentIndex(mulitSamplingIndex);
         } else {
-            mulitSamplingComboBox->setCurrentIndex(0);
-            m_pConfig->set(ConfigKey(kPreferencesGroup, kMultiSamplingKey), ConfigValue(0));
+            mulitSamplingComboBox->setCurrentIndex(0); // Disabled
+            m_pConfig->set(
+                    ConfigKey(kPreferencesGroup, kMultiSamplingKey),
+                    ConfigValue(0));
         }
     } else
 #endif
@@ -326,7 +331,8 @@ void DlgPrefInterface::slotResetToDefaults() {
         static_cast<int>(mixxx::ScreenSaverPreference::PREVENT_ON)));
 
 #ifdef MIXXX_USE_QML
-    mulitSamplingComboBox->setCurrentIndex(4); // 4x MSAA
+    mulitSamplingComboBox->setCurrentIndex(mulitSamplingComboBox->findData(
+            static_cast<int>(mixxx::MultiSamplingMode::FOUR))); // 4x MSAA
 #endif
 
 #ifdef Q_OS_IOS
@@ -451,9 +457,8 @@ void DlgPrefInterface::slotApply() {
     }
 
 #ifdef MIXXX_USE_QML
-    int multiSampling = mulitSamplingComboBox->itemData(
-                                                     mulitSamplingComboBox->currentIndex())
-                                .toInt();
+    int multiSampling = static_cast<int>(mulitSamplingComboBox->itemData(
+            mulitSamplingComboBox->currentIndex()));
     m_pConfig->set(ConfigKey(kPreferencesGroup, kMultiSamplingKey), ConfigValue(multiSampling));
 #endif
 

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 m_pConfig->getValue(
+            ConfigKey(kPreferencesGroup, kMultiSamplingKey),
+            static_cast<int>(mixxx::MultiSamplingMode::DISABLED));
 }
 
 // static