fix (switch): Reinitialize audio after resuming from suspend (#388) (#…

…389)

Co-authored-by: Nicholas Nusgart <nicknusgart@gmail.com>

src/audio/SDLAudioPlayer.cpp

@@ -5,6 +5,11 @@ namespace LUS {
 SDLAudioPlayer::SDLAudioPlayer() : AudioPlayer() {
 }
 
+SDLAudioPlayer::~SDLAudioPlayer() {
+    SPDLOG_TRACE("destruct SDL audio player");
+    SDL_QuitSubSystem(SDL_INIT_AUDIO);
+}
+
 bool SDLAudioPlayer::DoInit(void) {
     if (SDL_Init(SDL_INIT_AUDIO) != 0) {
         SPDLOG_ERROR("SDL init error: %s\n", SDL_GetError());

src/audio/SDLAudioPlayer.h

@@ -6,6 +6,7 @@ namespace LUS {
 class SDLAudioPlayer : public AudioPlayer {
   public:
     SDLAudioPlayer();
+    ~SDLAudioPlayer();
 
     int Buffered(void);
     int GetDesiredBuffered(void);

src/port/switch/SwitchImpl.cpp

@@ -4,6 +4,9 @@
 #include <SDL2/SDL.h>
 #include "SwitchPerformanceProfiles.h"
 #include "public/bridge/consolevariablebridge.h"
+#include <spdlog/spdlog.h>
+#include "Context.h"
+#include "audio/Audio.h"
 
 #include <ImGui/imgui_internal.h>
 
@@ -165,8 +168,14 @@ static void on_applet_hook(AppletHookType hook, void* param) {
                     clkrstSetClockRate(&session, SWITCH_CPU_SPEEDS_VALUES[LUS::STOCK]);
                     clkrstCloseSession(&session);
                 }
-            } else
+            } else {
                 LUS::Switch::ApplyOverclock();
+                // reinitialize audio subsystem to fix audio problems after resuming from sleep
+                // see https://github.com/HarbourMasters/Shipwright/issues/3317
+                SPDLOG_INFO("restarting SDL audio system to work around audio problems on resume");
+                LUS::Context::GetInstance()->GetAudio()->SetAudioBackend(LUS::AudioBackend::SDL);
+            }
+
             break;
 
             /* Performance mode */
@@ -216,4 +225,4 @@ void LUS::Switch::ThrowMissingOTR(std::string OTRPath) {
                                            "\x1b[44;2H%s.",
                                            OTRPath.c_str(), RandomTexts[rand() % 25]);
 }
-#endif
+#endif