isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix engineConfig declaration crossing jump

Browse Source 
This fixes the following error:
```
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp: In member function 'virtual MxResult MxSoundManager::Create(MxU32, MxBool)':
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:119:1: error: jump to label 'done'
  119 | done:
      | ^~~~
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:78:22: note:   from here
   78 |                 goto done;
      |                      ^~~~
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:84:26: note:   crosses initialization of 'ma_engine_config engineConfig'
   84 |         ma_engine_config engineConfig = ma_engine_config_init();
      |                          ^~~~~~~~~~~~
```
This commit is contained in:
Anonymous Maarten 2024-06-23 01:12:46 +02:00
parent 07e65a2f4c
commit 1520f537d4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/omni/src/audio/mxsoundmanager.cpp
View File

@ -73,6 +73,7 @@ MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{ {
MxResult status = FAILURE; MxResult status = FAILURE;
MxBool locked = FALSE; MxBool locked = FALSE;
ma_engine_config engineConfig;
if (MxAudioManager::Create() != SUCCESS) { if (MxAudioManager::Create() != SUCCESS) {
goto done; goto done;
@ -81,7 +82,7 @@ MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
m_criticalSection.Enter(); m_criticalSection.Enter();
locked = TRUE; locked = TRUE;
ma_engine_config engineConfig = ma_engine_config_init(); engineConfig = ma_engine_config_init();
engineConfig.noDevice = MA_TRUE; engineConfig.noDevice = MA_TRUE;
engineConfig.channels = MxOmni::IsSound3D() ? 2 : 1; engineConfig.channels = MxOmni::IsSound3D() ? 2 : 1;
engineConfig.sampleRate = g_sampleRate; engineConfig.sampleRate = g_sampleRate;