be able to configure audioOutputEngine

Author: N3xoX1

config/NxEmu - Copy.config

@@ -0,0 +1,17 @@
+{
+   "Core" : {
+      "ModuleDirectory-x64" : "..\\..\\..\\modules\\x64",
+      "ShowConsole" : true,
+      "modules" : {
+         "loader" : "loader\\yuzu-loader_d.dll"
+      }
+   },
+   "UI" : {
+      "EnableModuleConfiguration" : true,
+      "LanguageDirectory" : "..\\..\\..\\lang",
+      "RecentFiles" : [
+         "D:\\Emulation\\switch\\Games\\Sonic Mania.xci",
+         "D:\\Emulation\\switch\\Games\\2048.nro"
+      ]
+   }
+}

external/sciterui

@@ -94,6 +94,11 @@
   style-set: std-hslider;
 }
 
+ComboBox
+{
+  width: 100%%;
+}
+
 @set std-hslider < std-hslider-base {
   :root {
     background: #565a5e;
@@ -146,6 +151,7 @@
   border: 1px solid #818183;
   background: none;
   border-radius: 0.3em;
+  margin: 0 0.5em 0 0;
 }
 
 input[type="checkbox"]:checked {
@@ -169,7 +175,7 @@
     <div id="ConfigContents" />
   </div>
   <div class="footer">
-    <button role="window-close">OK</button>
+    <button role="window-ok">OK</button>
     <button role="window-close">Cancel</button>
   </div>
 </body>

lang/english/html/system_config.html

@@ -2,19 +2,19 @@
   <div class="group-title">Audio</div>
   <div class="form-row">
     <div class="left"><label for="audioOutputEngine">Output Engine:</label></div>
-    <div class="right"><select id="audioOutputEngine"></select></div>
+    <div class="right"><ComboBox id="audioOutputEngine" /></div>
   </div>
   <div class="form-row">
     <div class="left"><label for="audioOutputDevice">Output Device:</label></div>
-    <div class="right"><select id="audioOutputDevice"></select></div>
+    <div class="right"><ComboBox id="audioOutputDevice" /></div>
   </div>
   <div class="form-row">
     <div class="left"><label for="inputDevice">Input Device:</label></div>
-    <div class="right"><select id="inputDevice"></select></div>
+    <div class="right"><ComboBox id="inputDevice" /></div>
   </div>
   <div class="form-row">
     <div class="left"><label for="soundMode">Sound Output Mode:</label></div>
-    <div class="right"><select id="soundMode"></select></div>
+    <div class="right"><ComboBox id="soundMode" /></div>
   </div>
   <div class="form-row slider-row">
     <div class="left"><label for="volume">Volume:</label></div>

lang/english/html/system_config_audio.html

@@ -9,7 +9,7 @@ extern "C" int __stdcall AllocConsole();
 bool AppInit(INotification * notification)
 {
     g_notify = notification;
-    if (!Settings::GetInstance().Initialize())
+    if (!SettingsStore::GetInstance().Initialize())
     {
         return false;
     }
@@ -35,5 +35,5 @@ bool AppInit(INotification * notification)
 void AppCleanup(void)
 {
     SwitchSystem::ShutDown();
-    Settings::CleanUp();
+    SettingsStore::CleanUp();
 }

src/nxemu-core/app_init.cpp

@@ -52,7 +52,7 @@ bool SwitchSystem::Initialize(IRenderWindow & window)
 
 void SwitchSystem::StartEmulation(void)
 {
-    Settings & settings = Settings::GetInstance();
+    SettingsStore & settings = SettingsStore::GetInstance();
     settings.SetBool(NXCoreSetting::EmulationRunning, true);
     m_emulationRunning = true;
     m_modules.StartEmulation();
@@ -68,6 +68,11 @@ void SwitchSystem::StopEmulation(void)
     m_modules.StopEmulation();
 }
 
+void SwitchSystem::FlushSettings(void)
+{
+    m_modules.FlushSettings();
+}
+
 IVideo & SwitchSystem::Video(void)
 {
     return *m_modules.Video();

src/nxemu-core/machine/switch_system.cpp

@@ -14,6 +14,7 @@ class SwitchSystem :
 
     void StartEmulation(void);
     void StopEmulation(void);
+    void FlushSettings(void);
 
     //ISwitchSystem
     ISystemloader & Systemloader();

src/nxemu-core/machine/switch_system.h

@@ -5,7 +5,8 @@ ModuleBase::ModuleBase() :
     m_moduleInfo({0}),
     EmulationStarting(nullptr),
     EmulationStopping(nullptr),
-    ModuleCleanup(nullptr)
+    ModuleCleanup(nullptr),
+    FlushSettings(nullptr)
 {
 }
 
@@ -43,11 +44,13 @@ bool ModuleBase::Load(const char * fileName, IModuleNotification * notification,
     ModuleCleanup = (ModuleBase::tyModuleCleanup)DynamicLibraryGetProc(m_lib, "ModuleCleanup");
     EmulationStarting = (ModuleBase::tyEmulationStarting)DynamicLibraryGetProc(m_lib, "EmulationStarting");
     EmulationStopping = (ModuleBase::tyEmulationStopping)DynamicLibraryGetProc(m_lib, "EmulationStopping");
+    FlushSettings = (ModuleBase::tyFlushSettings)DynamicLibraryGetProc(m_lib, "FlushSettings");
 
     if (ModuleInitialize == nullptr ||
         ModuleCleanup == nullptr ||
         EmulationStarting == nullptr ||
-        EmulationStopping == nullptr)
+        EmulationStopping == nullptr ||
+        FlushSettings == nullptr)
     {
         return false;
     }
@@ -107,4 +110,5 @@ void ModuleBase::ModuleDone(bool callUnloadModule)
     ModuleCleanup = nullptr;
     EmulationStarting = nullptr;
     EmulationStopping = nullptr;
+    FlushSettings = nullptr;
 }

src/nxemu-core/modules/module_base.cpp

@@ -17,6 +17,7 @@ class ModuleBase
     typedef void(CALL * tyModuleCleanup)();
     typedef void(CALL * tyEmulationStarting)();
     typedef void(CALL * tyEmulationStopping)();
+    typedef void(CALL * tyFlushSettings)();
 
 public:
     ModuleBase();
@@ -26,6 +27,7 @@ class ModuleBase
     ModuleBase::tyEmulationStarting EmulationStarting;
     ModuleBase::tyEmulationStopping EmulationStopping;
     ModuleBase::tyModuleCleanup ModuleCleanup;
+    ModuleBase::tyFlushSettings FlushSettings;
 
 protected:
     virtual void UnloadModule(void) = 0;

src/nxemu-core/modules/module_base.h

@@ -1,22 +1,80 @@
 #include "module_settings.h"
 #include "settings/settings.h"
 
-std::string ModuleSettings::GetString(const char * setting) const
+const char * ModuleSettings::GetString(const char * setting) const
 {
-    return Settings::GetInstance().GetString(setting);
+    return SettingsStore::GetInstance().GetString(setting);
 }
 
 bool ModuleSettings::GetBool(const char * setting) const
 {
-    return Settings::GetInstance().GetBool(setting);
+    return SettingsStore::GetInstance().GetBool(setting);
+}
+
+int32_t ModuleSettings::GetInt(const char* setting) const
+{
+    return SettingsStore::GetInstance().GetInt(setting);
 }
 
 void ModuleSettings::SetString(const char * setting, const char * value)
 {
-    Settings::GetInstance().SetString(setting, value);
+    SettingsStore::GetInstance().SetString(setting, value);
 }
 
 void ModuleSettings::SetBool(const char * setting, bool value)
 {
-    Settings::GetInstance().SetBool(setting, value);
+    SettingsStore::GetInstance().SetBool(setting, value);
+}
+
+void ModuleSettings::SetInt(const char * setting, int32_t value)
+{
+    SettingsStore::GetInstance().SetInt(setting, value);
+}
+
+void ModuleSettings::SetDefaultBool(const char * setting, bool value)
+{
+    SettingsStore::GetInstance().SetDefaultBool(setting, value);
+}
+
+void ModuleSettings::SetDefaultInt(const char * setting, int32_t value)
+{
+    SettingsStore::GetInstance().SetDefaultInt(setting, value);
+}
+
+void ModuleSettings::SetDefaultString(const char * setting, const char * value)
+{
+    SettingsStore::GetInstance().SetDefaultString(setting, value);
+}
+
+const char * ModuleSettings::GetSectionSettings(const char * section) const
+{
+    JsonValue json = SettingsStore::GetInstance().GetSettings(section);
+    m_sectionSetting = json.isNull() ? "" : JsonStyledWriter().write(json);
+    return m_sectionSetting.c_str();
+}
+
+void ModuleSettings::SetSectionSettings(const char * section, const std::string & json)
+{
+    JsonValue root;
+    if (!json.empty())
+    {
+        JsonReader reader;
+        if (!reader.Parse(json.data(), json.data() + json.size(), root))
+        {
+            return;
+        }
+    }
+    SettingsStore& settings = SettingsStore::GetInstance();
+    settings.SetSettings(section, root);
+    settings.Save();
+}
+
+void ModuleSettings::RegisterCallback(const char* setting, SettingChangeCallback callback, void * userData)
+{
+    SettingsStore::GetInstance().RegisterCallback(setting, callback, userData);
+}
+
+void ModuleSettings::UnregisterCallback(const char* setting, SettingChangeCallback callback, void* userData)
+{
+    __debugbreak();
 }