From e7b0147eb4b7004b47df9e57ae9627e971b110b3 Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Sun, 26 Dec 2021 16:52:11 +0100 Subject: [PATCH] RMG-Core: add audio plugin settings --- Source/RMG-Core/Settings/Settings.cpp | 12 ++++++++++-- Source/RMG-Core/Settings/SettingsID.hpp | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/RMG-Core/Settings/Settings.cpp b/Source/RMG-Core/Settings/Settings.cpp index bb678da9..04b56968 100644 --- a/Source/RMG-Core/Settings/Settings.cpp +++ b/Source/RMG-Core/Settings/Settings.cpp @@ -106,6 +106,7 @@ static std::vector l_sectionList; #define SETTING_SECTION_ROMBROWSER SETTING_SECTION_GUI " RomBrowser" #define SETTING_SECTION_SETTINGS SETTING_SECTION_CORE " Settings" #define SETTING_SECTION_M64P "Core" +#define SETTING_SECTION_AUDIO SETTING_SECTION_GUI " - Audio Plugin" // retrieves l_Setting from settingId static l_Setting get_setting(SettingsID settingId) @@ -146,9 +147,9 @@ static l_Setting get_setting(SettingsID settingId) case SettingsID::Core_AUDIO_Plugin: setting = {SETTING_SECTION_CORE, "AUDIO_Plugin", #ifdef _WIN32 - "Plugin\\Audio\\mupen64plus-audio-sdl2.dll", + "Plugin\\Audio\\RMG-Audio.dll", #else - "Plugin/Audio/mupen64plus-audio-sdl2.so", + "Plugin/Audio/RMG-Audio.so", #endif // _WIN32 }; break; @@ -340,6 +341,13 @@ static l_Setting get_setting(SettingsID settingId) case SettingsID::Settings_HasForceUsedSetOnce: setting = {SETTING_SECTION_SETTINGS, "HasForceUsedSetOnce", false}; break; + + case SettingsID::Audio_Volume: + setting = {SETTING_SECTION_AUDIO, "Volume", 100}; + break; + case SettingsID::Audio_Muted: + setting = {SETTING_SECTION_AUDIO, "Muted", false}; + break; } return setting; diff --git a/Source/RMG-Core/Settings/SettingsID.hpp b/Source/RMG-Core/Settings/SettingsID.hpp index 18bf18a0..fccdbefe 100644 --- a/Source/RMG-Core/Settings/SettingsID.hpp +++ b/Source/RMG-Core/Settings/SettingsID.hpp @@ -89,6 +89,10 @@ enum class SettingsID // Settings Settings Settings_HasForceUsedSetOnce, + // Audio Plugin Settings + Audio_Volume, + Audio_Muted, + Invalid };