Engine: iterate through known good audio drivers before giving up

ericoporto · Jun 18, 2022 · 30b7185 · 30b7185
1 parent 5c3a5ea
commit 30b7185
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/Engine/platform/base/agsplatformdriver.h b/Engine/platform/base/agsplatformdriver.h
@@ -102,6 +102,8 @@ class AGSPlatformDriver
     virtual eScriptSystemOSID GetSystemOSID() = 0;
     virtual void GetSystemTime(ScriptDateTime*);
     virtual SetupReturnValue RunSetup(const Common::ConfigTree &cfg_in, Common::ConfigTree &cfg_out);
+
+    virtual std::vector<String> GetKnownGoodAudioDrivers() { return {}; }
     // Formats message and writes to standard platform's output;
     // Always adds trailing '\n' after formatted string
     virtual void WriteStdOut(const char *fmt, ...);

diff --git a/Engine/platform/base/sys_main.cpp b/Engine/platform/base/sys_main.cpp
@@ -106,6 +106,15 @@ bool sys_audio_init(const String &driver_name)
         if (!res)
             Debug::Printf(kDbgMsg_Error, "Failed to initialize audio backend: %s", SDL_GetError());
     }
+    if (!res)
+    {
+        for(const String& possible_driver : platform->GetKnownGoodAudioDrivers()) {
+            res = SDL_AudioInit(possible_driver.GetCStr()) == 0;
+            if (!res)
+                Debug::Printf(kDbgMsg_Error, "Failed to initialize audio driver %s; error: %s",
+                              possible_driver.GetCStr(), SDL_GetError());
+        }
+    }
     if (res)
         Debug::Printf(kDbgMsg_Info, "Audio driver: %s", SDL_GetCurrentAudioDriver());
     return res;

diff --git a/Engine/platform/linux/acpllnx.cpp b/Engine/platform/linux/acpllnx.cpp
@@ -27,6 +27,7 @@ struct AGSLinux : AGSPlatformXDGUnix {
   eScriptSystemOSID GetSystemOSID() override;
   int  InitializeCDPlayer() override;
   void ShutdownCDPlayer() override;
+  std::vector<String> GetKnownGoodAudioDrivers() override;
 };
 
 
@@ -46,6 +47,11 @@ void AGSLinux::ShutdownCDPlayer() {
   cd_exit();
 }
 
+std::vector<String> AGSLinux::GetKnownGoodAudioDrivers()
+{
+    return {"pulseaudio", "alsa", "jack", "pipewire"};
+}
+
 AGSPlatformDriver* AGSPlatformDriver::CreateDriver()
 {
     return new AGSLinux();

diff --git a/Engine/platform/windows/acplwin.cpp b/Engine/platform/windows/acplwin.cpp
@@ -97,6 +97,7 @@ struct AGSWin32 : AGSPlatformDriver {
   void ResumeApplication() override;
   void ValidateWindowSize(int &x, int &y, bool borderless) const override;
   SDL_Surface *CreateWindowIcon() override;
+  std::vector<String> GetKnownGoodAudioDrivers() override;
 
   // Returns command line argument in a UTF-8 format
   String GetCommandArg(size_t arg_index) override;
@@ -477,6 +478,11 @@ String AGSWin32::GetCommandArg(size_t arg_index)
     return arg;
 }
 
+std::vector<String> AGSWin32::GetKnownGoodAudioDrivers()
+{
+    return {"wasapi", "directsound", "winmm"};
+}
+
 AGSPlatformDriver* AGSPlatformDriver::CreateDriver()
 {
     return new AGSWin32();