thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-27 21:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move engine initialization.

Browse source
This commit is contained in:
Dario 2024-12-12 01:28:51 -03:00
parent fc31b32517
commit 2ecdf59772
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
UnleashedRecomp/apu/embedded_player.cpp
View file

@ -32,7 +32,6 @@ struct EmbeddedSoundData
}; };
static ma_engine g_audioEngine = {}; static ma_engine g_audioEngine = {};
static bool g_audioEngineInitialized = false;
static std::array<EmbeddedSoundData, size_t(EmbeddedSound::Count)> g_embeddedSoundData = {}; static std::array<EmbeddedSoundData, size_t(EmbeddedSound::Count)> g_embeddedSoundData = {};
static const std::unordered_map<std::string, EmbeddedSound> g_embeddedSoundMap = static const std::unordered_map<std::string, EmbeddedSound> g_embeddedSoundMap =
{ {
@ -134,6 +133,13 @@ static void PlayEmbeddedSound(EmbeddedSound s)
void EmbeddedPlayer::Init() 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; s_isActive = true;
} }
@ -147,19 +153,6 @@ void EmbeddedPlayer::Play(const char *name)
return; 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) if (g_audioEngine.pDevice == nullptr)
{ {
return; return;
@ -204,6 +197,5 @@ void EmbeddedPlayer::Shutdown()
ma_engine_uninit(&g_audioEngine); ma_engine_uninit(&g_audioEngine);
} }
g_audioEngineInitialized = false;
s_isActive = false; s_isActive = false;
} }