more settings

src/common/config.cpp

@@ -33,9 +33,7 @@ namespace Config {
 
 static bool isNeo = false;
 static bool isDevKit = false;
-static bool playBGM = false;
 static bool isTrophyPopupDisabled = false;
-static int BGMvolume = 50;
 static bool enableDiscordRPC = false;
 static u32 screenWidth = 1280;
 static u32 screenHeight = 720;
@@ -169,14 +167,6 @@ bool getisTrophyPopupDisabled() {
     return isTrophyPopupDisabled;
 }
 
-bool getPlayBGM() {
-    return playBGM;
-}
-
-int getBGMvolume() {
-    return BGMvolume;
-}
-
 bool getEnableDiscordRPC() {
     return enableDiscordRPC;
 }
@@ -417,14 +407,6 @@ void setisTrophyPopupDisabled(bool disable) {
     isTrophyPopupDisabled = disable;
 }
 
-void setPlayBGM(bool enable) {
-    playBGM = enable;
-}
-
-void setBGMvolume(int volume) {
-    BGMvolume = volume;
-}
-
 void setEnableDiscordRPC(bool enable) {
     enableDiscordRPC = enable;
 }
@@ -634,11 +616,9 @@ void load(const std::filesystem::path& path) {
 
         isNeo = toml::find_or<bool>(general, "isPS4Pro", false);
         isDevKit = toml::find_or<bool>(general, "isDevKit", false);
-        playBGM = toml::find_or<bool>(general, "playBGM", false);
         isTrophyPopupDisabled = toml::find_or<bool>(general, "isTrophyPopupDisabled", false);
         trophyNotificationDuration =
             toml::find_or<double>(general, "trophyNotificationDuration", 5.0);
-        BGMvolume = toml::find_or<int>(general, "BGMvolume", 50);
         enableDiscordRPC = toml::find_or<bool>(general, "enableDiscordRPC", true);
         logFilter = toml::find_or<std::string>(general, "logFilter", "");
         logType = toml::find_or<std::string>(general, "logType", "sync");
@@ -822,8 +802,6 @@ void save(const std::filesystem::path& path) {
     data["General"]["isDevKit"] = isDevKit;
     data["General"]["isTrophyPopupDisabled"] = isTrophyPopupDisabled;
     data["General"]["trophyNotificationDuration"] = trophyNotificationDuration;
-    data["General"]["playBGM"] = playBGM;
-    data["General"]["BGMvolume"] = BGMvolume;
     data["General"]["enableDiscordRPC"] = enableDiscordRPC;
     data["General"]["logFilter"] = logFilter;
     data["General"]["logType"] = logType;
@@ -954,8 +932,6 @@ void setDefaultValues() {
     isDevKit = false;
     isFullscreen = false;
     isTrophyPopupDisabled = false;
-    playBGM = false;
-    BGMvolume = 50;
     enableDiscordRPC = true;
     screenWidth = 1280;
     screenHeight = 720;

src/common/config.h

@@ -29,8 +29,6 @@ bool getIsFullscreen();
 std::string getFullscreenMode();
 bool isNeoModeConsole();
 bool isDevKitConsole();
-bool getPlayBGM();
-int getBGMvolume();
 bool getisTrophyPopupDisabled();
 bool getEnableDiscordRPC();
 bool getCompatibilityEnabled();
@@ -92,8 +90,6 @@ void setScreenHeight(u32 height);
 void setIsFullscreen(bool enable);
 void setFullscreenMode(std::string mode);
 void setisTrophyPopupDisabled(bool disable);
-void setPlayBGM(bool enable);
-void setBGMvolume(int volume);
 void setEnableDiscordRPC(bool enable);
 void setLanguage(u32 language);
 void setNeoMode(bool enable);

src/qt_gui/game_grid_frame.cpp

@@ -76,7 +76,7 @@ void GameGridFrame::onCurrentCellChanged(int currentRow, int currentColumn, int
 }
 
 void GameGridFrame::PlayBackgroundMusic(QString path) {
-    if (path.isEmpty() || !Config::getPlayBGM()) {
+    if (path.isEmpty() || !m_gui_settings->GetValue(gui::gl_playBackgroundMusic).toBool()) {
         BackgroundMusicPlayer::getInstance().stopMusic();
         return;
     }

src/qt_gui/game_list_frame.cpp

@@ -99,7 +99,7 @@ void GameListFrame::onCurrentCellChanged(int currentRow, int currentColumn, int
 }
 
 void GameListFrame::PlayBackgroundMusic(QTableWidgetItem* item) {
-    if (!item || !Config::getPlayBGM()) {
+    if (!item || !m_gui_settings->GetValue(gui::gl_playBackgroundMusic).toBool()) {
         BackgroundMusicPlayer::getInstance().stopMusic();
         return;
     }

src/qt_gui/gui_settings.h

@@ -22,6 +22,8 @@ const gui_value gl_icon_size = gui_value(game_list, "icon_size", 36);
 const gui_value gl_slider_pos = gui_value(game_list, "slider_pos", 0);
 const gui_value gl_showBackgroundImage = gui_value(game_list, "showBackgroundImage", true);
 const gui_value gl_backgroundImageOpacity = gui_value(game_list, "backgroundImageOpacity", 50);
+const gui_value gl_playBackgroundMusic = gui_value(game_list, "playBackgroundMusic", true);
+const gui_value gl_backgroundMusicVolume = gui_value(game_list, "backgroundMusicVolume", 50);
 
 // game grid settings
 const gui_value gg_icon_size = gui_value(game_grid, "icon_size", 69);

src/qt_gui/main_window.cpp

@@ -952,7 +952,8 @@ void MainWindow::ConfigureGuiFromSettings() {
     } else if (table_mode == 2) {
         ui->setlistElfAct->setChecked(true);
     }
-    BackgroundMusicPlayer::getInstance().setVolume(Config::getBGMvolume());
+    BackgroundMusicPlayer::getInstance().setVolume(
+        m_gui_settings->GetValue(gui::gl_backgroundMusicVolume).toInt());
 }
 
 void MainWindow::SaveWindowState() {

src/qt_gui/settings_dialog.cpp

@@ -545,7 +545,7 @@ void SettingsDialog::LoadValuesFromConfig() {
 
     backgroundImageOpacitySlider_backup =
         m_gui_settings->GetValue(gui::gl_backgroundImageOpacity).toInt();
-    bgm_volume_backup = Config::getBGMvolume();
+    bgm_volume_backup = m_gui_settings->GetValue(gui::gl_backgroundMusicVolume).toInt();
 }
 
 void SettingsDialog::InitializeEmulatorLanguages() {
@@ -759,8 +759,7 @@ void SettingsDialog::UpdateSettings() {
     } else if (ui->radioButton_Bottom->isChecked()) {
         Config::setSideTrophy("bottom");
     }
-
+    m_gui_settings->SetValue(gui::gl_playBackgroundMusic, ui->playBGMCheckBox->isChecked());
-    Config::setPlayBGM(ui->playBGMCheckBox->isChecked());
     Config::setAllowHDR(ui->enableHDRCheckBox->isChecked());
     Config::setLogType(logTypeMap.value(ui->logTypeComboBox->currentText()).toStdString());
     Config::setLogFilter(ui->logFilterLineEdit->text().toStdString());
@@ -769,7 +768,7 @@ void SettingsDialog::UpdateSettings() {
     Config::setCursorState(ui->hideCursorComboBox->currentIndex());
     Config::setCursorHideTimeout(ui->idleTimeoutSpinBox->value());
     Config::setGpuId(ui->graphicsAdapterBox->currentIndex() - 1);
-    Config::setBGMvolume(ui->BGMVolumeSlider->value());
+    m_gui_settings->SetValue(gui::gl_backgroundMusicVolume, ui->BGMVolumeSlider->value());
     Config::setLanguage(languageIndexes[ui->consoleLanguageComboBox->currentIndex()]);
     Config::setEnableDiscordRPC(ui->discordRPCCheckbox->isChecked());
     Config::setScreenWidth(ui->widthSpinBox->value());
@@ -872,4 +871,6 @@ void SettingsDialog::ResetInstallFolders() {
 void SettingsDialog::setDefaultValues() {
     m_gui_settings->SetValue(gui::gl_showBackgroundImage, true);
     m_gui_settings->SetValue(gui::gl_backgroundImageOpacity, 50);
+    m_gui_settings->SetValue(gui::gl_playBackgroundMusic, false);
+    m_gui_settings->SetValue(gui::gl_backgroundMusicVolume, 50);
 }