Update to use Helix for audio

dcvz · Mar 9, 2023 · c64379b · c64379b
1 parent 8b56ca4
commit c64379b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/helix b/helix
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -679,6 +679,9 @@ else()
         "$<$<BOOL:${BUILD_CROWD_CONTROL}>:SDL2_net::SDL2_net>"
 		${CMAKE_DL_LIBS}
 		Threads::Threads
+        "$<$<PLATFORM_ID:Darwin>:-framework CoreFoundation>"
+        "$<$<PLATFORM_ID:Darwin>:-framework AudioToolbox>"
+        "$<$<PLATFORM_ID:Darwin>:-framework CoreAudio>"
 	)
 endif()
 

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -410,6 +410,7 @@ extern "C" void OTRAudio_Exit() {
 
     // Wait until the audio thread quit
     audio.thread.join();
+    HLXAudioPlayerDeinit();
 }
 
 extern "C" void VanillaItemTable_Init() {
@@ -1355,19 +1356,19 @@ extern "C" int16_t OTRGetRectDimensionFromRightEdge(float v) {
 }
 
 extern "C" bool AudioPlayer_Init(void) {
-    return AudioPlayerInit();
+    return HLXAudioPlayerInit(44100, 2);
 }
 
 extern "C" int AudioPlayer_Buffered(void) {
-    return AudioPlayerBuffered();
+    return HLXAudioPlayerGetBuffered();
 }
 
 extern "C" int AudioPlayer_GetDesiredBuffered(void) {
-    return AudioPlayerGetDesiredBuffered();
+    return HLXAudioPlayerGetDesiredBuffered();
 }
 
 extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len) {
-    AudioPlayerPlayFrame(buf, len);
+    HLXAudioPlayerPlayBuffer(buf, len);
 }
 
 extern "C" int Controller_ShouldRumble(size_t slot) {