Merge pull request #726 from nicolasnoble/safe-mode-miniaudio

Safe mode also uses Null Miniaudio driver.

Author: nicolasnoble

src/core/system.h

@@ -53,7 +53,9 @@ DstTP ClockCast(const SrcTP tp) {
 }
 
 namespace Events {
-struct SettingsLoaded {};
+struct SettingsLoaded {
+    bool safe = false;
+};
 struct Quitting {};
 struct LogMessage {
     LogClass logClass;

src/gui/gui.cc

@@ -306,7 +306,8 @@ end)(jit.status()))
         auto& emuSettings = PCSX::g_emulator->settings;
         auto& debugSettings = emuSettings.get<Emulator::SettingDebugSettings>();
         json j;
-        if (cfg.is_open() && !m_args.get<bool>("safe")) {
+        bool safeMode = m_args.get<bool>("safe").value_or(false);
+        if (cfg.is_open() && !safeMode) {
             try {
                 cfg >> j;
             } catch (...) {
@@ -370,7 +371,7 @@ end)(jit.status()))
 
         g_system->activateLocale(emuSettings.get<PCSX::Emulator::SettingLocale>());
 
-        g_system->m_eventBus->signal(Events::SettingsLoaded{});
+        g_system->m_eventBus->signal(Events::SettingsLoaded{safeMode});
 
         std::filesystem::path isoToOpen = m_args.get<std::string>("iso", "");
         if (!isoToOpen.empty()) PCSX::g_emulator->m_cdrom->m_iso.setIsoPath(isoToOpen);

src/spu/miniaudio.cc

@@ -54,10 +54,10 @@ PCSX::SPU::MiniAudio::MiniAudio(PCSX::SPU::SettingsType& settings)
             throw std::runtime_error("Unable to stop NULL audio device");
         };
     });
-    m_listener.listen<Events::SettingsLoaded>([this](const auto& event) { init(); });
+    m_listener.listen<Events::SettingsLoaded>([this](const auto& event) { init(event.safe); });
 }
 
-void PCSX::SPU::MiniAudio::init() {
+void PCSX::SPU::MiniAudio::init(bool safe) {
     // First, initialize NULL device
     ma_backend nullContext = ma_backend_null;
     if (ma_context_init(&nullContext, 1, NULL, &m_contextNull) != MA_SUCCESS) {
@@ -84,20 +84,26 @@ void PCSX::SPU::MiniAudio::init() {
     // Then probe for actual device, and initialize it
     ma_backend backends[ma_backend_null + 1];
     unsigned count = 0;
-    bool found = false;
-    for (unsigned i = 0; i <= ma_backend_null; i++) {
-        ma_backend b = ma_backend(i);
-        if (!ma_is_backend_enabled(b)) continue;
-        backends[count++] = b;
-        if (ma_get_backend_name(b) == m_settings.get<Backend>().value) {
-            found = true;
-            count = 1;
-            backends[0] = b;
-            break;
+    if (safe) {
+        backends[0] = ma_backend_null;
+        count = 1;
+        m_settings.get<Backend>().value = ma_get_backend_name(ma_backend_null);
+    } else {
+        bool found = false;
+        for (unsigned i = 0; i <= ma_backend_null; i++) {
+            ma_backend b = ma_backend(i);
+            if (!ma_is_backend_enabled(b)) continue;
+            backends[count++] = b;
+            if (ma_get_backend_name(b) == m_settings.get<Backend>().value) {
+                found = true;
+                count = 1;
+                backends[0] = b;
+                break;
+            }
+        }
+        if (!found) {
+            m_settings.get<Backend>().reset();
         }
-    }
-    if (!found) {
-        m_settings.get<Backend>().reset();
     }
     if (ma_context_init(backends, count, NULL, &m_context) != MA_SUCCESS) {
         throw std::runtime_error("Error initializing miniaudio context");

src/spu/miniaudio.h

@@ -118,7 +118,7 @@ class MiniAudio {
     SettingsType& m_settings;
     void callback(ma_device* device, float* output, ma_uint32 frameCount);
     void callbackNull(ma_device* device, float* output, ma_uint32 frameCount);
-    void init();
+    void init(bool safe = false);
     void uninit();
 
     ma_context m_context;