From 2ecdf59772e3de94d8fb06f1ceac9b90f42ea47d Mon Sep 17 00:00:00 2001
From: Dario <dariosamo@gmail.com>
Date: Thu, 12 Dec 2024 01:28:51 -0300
Subject: [PATCH] Move engine initialization.

---
 UnleashedRecomp/apu/embedded_player.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/UnleashedRecomp/apu/embedded_player.cpp b/UnleashedRecomp/apu/embedded_player.cpp
index acecc3c5..98ce1e0e 100644
--- a/UnleashedRecomp/apu/embedded_player.cpp
+++ b/UnleashedRecomp/apu/embedded_player.cpp
@@ -32,7 +32,6 @@ struct EmbeddedSoundData
 };
 
 static ma_engine g_audioEngine = {};
-static bool g_audioEngineInitialized = false;
 static std::array<EmbeddedSoundData, size_t(EmbeddedSound::Count)> g_embeddedSoundData = {};
 static const std::unordered_map<std::string, EmbeddedSound> g_embeddedSoundMap =
 {
@@ -134,6 +133,13 @@ static void PlayEmbeddedSound(EmbeddedSound s)
 
 void EmbeddedPlayer::Init() 
 {
+    ma_engine_config engineConfig = ma_engine_config_init();
+    ma_result res = ma_engine_init(&engineConfig, &g_audioEngine);
+    if (res == MA_SUCCESS)
+    {
+        fprintf(stderr, "ma_engine_init failed with error code %d.\n", res);
+    }
+
     s_isActive = true;
 }
 
@@ -147,19 +153,6 @@ void EmbeddedPlayer::Play(const char *name)
         return;
     }
 
-    if (!g_audioEngineInitialized)
-    {
-        ma_engine_config engineConfig = ma_engine_config_init();
-        ma_result res = ma_engine_init(&engineConfig, &g_audioEngine);
-        if (res != MA_SUCCESS)
-        {
-            fprintf(stderr, "ma_engine_init failed with error code %d.\n", res);
-        }
-
-        // Do not attempt to initialize this again if it fails.
-        g_audioEngineInitialized = true;
-    }
-
     if (g_audioEngine.pDevice == nullptr)
     {
         return;
@@ -204,6 +197,5 @@ void EmbeddedPlayer::Shutdown()
         ma_engine_uninit(&g_audioEngine);
     }
 
-    g_audioEngineInitialized = false;
     s_isActive = false;
 }