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

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-06-08 17:05:49 -04:00
parent 80bf1c6f92
commit 4ae52e4b5b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -330,7 +330,7 @@ add_library(omni STATIC
register_lego1_target(omni) register_lego1_target(omni)
set_property(TARGET omni PROPERTY ARCHIVE_OUTPUT_NAME "omni$<$<CONFIG:Debug>:d>") set_property(TARGET omni PROPERTY ARCHIVE_OUTPUT_NAME "omni$<$<CONFIG:Debug>:d>")
target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util") target_include_directories(omni PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(omni PRIVATE libsmacker miniaudio) target_link_libraries(omni PRIVATE winmm libsmacker miniaudio)
add_library(lego1 SHARED add_library(lego1 SHARED
LEGO1/define.cpp LEGO1/define.cpp
@ -493,7 +493,7 @@ if (ISLE_BUILD_APP)
target_link_libraries(isle PRIVATE SDL3::SDL3 iniparser-static) target_link_libraries(isle PRIVATE SDL3::SDL3 iniparser-static)
# Link DSOUND, WINMM, and LEGO1 # Link DSOUND, WINMM, and LEGO1
target_link_libraries(isle PRIVATE lego1) target_link_libraries(isle PRIVATE winmm lego1)
# Make sure filenames are ALL CAPS # Make sure filenames are ALL CAPS
set_property(TARGET isle PROPERTY OUTPUT_NAME ISLE) set_property(TARGET isle PROPERTY OUTPUT_NAME ISLE)

3
LEGO1/lego/legoomni/src/audio/lego3dwavepresenter.cpp
View File

@ -50,7 +50,6 @@ void Lego3DWavePresenter::StartingTickle()
} }
if (m_sound.Create(&(MxWavePresenter::m_sound), buff, m_volume) != SUCCESS) { if (m_sound.Create(&(MxWavePresenter::m_sound), buff, m_volume) != SUCCESS) {
ma_sound_uninit(&(MxWavePresenter::m_sound));
EndAction(); EndAction();
} }
} }
@ -61,5 +60,5 @@ void Lego3DWavePresenter::StartingTickle()
void Lego3DWavePresenter::StreamingTickle() void Lego3DWavePresenter::StreamingTickle()
{ {
MxWavePresenter::StreamingTickle(); MxWavePresenter::StreamingTickle();
// m_sound.UpdatePosition(m_dsBuffer); m_sound.UpdatePosition(&(MxWavePresenter::m_sound));
} }

2
LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp
View File

@ -69,7 +69,7 @@ void LegoSoundManager::Destroy()
// FUNCTION: LEGO1 0x1002a3a0 // FUNCTION: LEGO1 0x1002a3a0
MxResult LegoSoundManager::Tickle() MxResult LegoSoundManager::Tickle()
{ {
return MxSoundManager::Tickle(); MxSoundManager::Tickle();
AUTOLOCK(m_criticalSection); AUTOLOCK(m_criticalSection);
return m_cacheSoundManager->Tickle(); return m_cacheSoundManager->Tickle();