WIP: SDL_Mixer sound player device

Author: benstone

CMakeLists.txt

@@ -94,6 +94,7 @@ elseif("${3DMM_GUI}" STREQUAL "SDL")
 
     find_package(SDL2 CONFIG REQUIRED)
     find_package(SDL2_ttf CONFIG REQUIRED)
+    find_package(SDL2_mixer CONFIG REQUIRED)
 
     # TODO: Find libiniparser if installed
     include(FetchIniParser)

cmake/FetchSDL2.cmake

@@ -4,18 +4,23 @@ FetchContent_Declare(
   URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.6/SDL2-devel-2.32.6-VC.zip
   DOWNLOAD_EXTRACT_TIMESTAMP ON
 )
-
-if(NOT sdl2_windows_POPULATED)
-    FetchContent_Populate(sdl2_windows)
-    set(ENV{SDL2_DIR} ${sdl2_windows_SOURCE_DIR})
-endif()
-
 FetchContent_Declare(
     sdl2_ttf_windows
     URL https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-devel-2.24.0-VC.zip
     DOWNLOAD_EXTRACT_TIMESTAMP ON
 )
-if(NOT sdl2_ttf_windows_POPULATED)
-    FetchContent_Populate(sdl2_ttf_windows)
-    set(ENV{SDL2_ttf_DIR} ${sdl2_ttf_windows_SOURCE_DIR})
-endif()
+FetchContent_Declare(
+    sdl2_mixer_windows
+    URL https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.1/SDL2_mixer-devel-2.8.1-VC.zip
+    DOWNLOAD_EXTRACT_TIMESTAMP ON
+)
+
+
+FetchContent_MakeAvailable(sdl2_windows)
+set(ENV{SDL2_DIR} ${sdl2_windows_SOURCE_DIR})
+
+FetchContent_MakeAvailable(sdl2_ttf_windows)
+set(ENV{SDL2_ttf_DIR} ${sdl2_ttf_windows_SOURCE_DIR})
+
+FetchContent_MakeAvailable(sdl2_mixer_windows)
+set(ENV{SDL2_mixer_DIR} ${sdl2_mixer_windows_SOURCE_DIR})

kauai/CMakeLists.txt

@@ -262,9 +262,9 @@ target_link_libraries(
     KauaiStream
 )
 
-if (3DMM_GUI STREQUAL "Win32")
+# Build AudioMan and Win32 MIDI playback devices for all Windows builds
+if(WIN32)
     # Win32: Use AudioMan for wave sounds
-
     if (NOT "${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "None")
         target_sources(
             KauaiSound
@@ -303,9 +303,20 @@ if (3DMM_GUI STREQUAL "Win32")
         PUBLIC
         winmm
     )
+endif()
 
-else()
-    message(WARNING "Sound playback disabled")
+# SDL Sound playback support
+if(3DMM_GUI STREQUAL "SDL")
+    target_sources(
+        KauaiSound
+        PRIVATE
+        "${PROJECT_SOURCE_DIR}/kauai/src/sndsdl.cpp"
+    )
+    target_link_libraries(
+        KauaiSound
+        PUBLIC
+        SDL2_mixer::SDL2_mixer
+    )
 endif()
 
 # Pic: vector graphics support
@@ -692,6 +703,11 @@ if (WIN32 AND 3DMM_GUI STREQUAL "SDL")
         COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:SDL2_ttf::SDL2_ttf>" "$<TARGET_FILE_DIR:khello>"
         VERBATIM
     )
+    add_custom_command(
+        TARGET khello POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE:SDL2_mixer::SDL2_mixer>" "$<TARGET_FILE_DIR:khello>"
+        VERBATIM
+    )
 endif()
 
 if (3DMM_GUI STREQUAL "Win32")

kauai/src/appb.cpp

@@ -13,6 +13,10 @@
 #include "frame.h"
 ASSERTNAME
 
+#ifdef KAUAI_SDL
+#include <sndsdl.h>
+#endif // KAUAI_SDL
+
 PAPPB vpappb;
 PCEX vpcex;
 PSNDM vpsndm;
@@ -495,6 +499,16 @@ bool APPB::_FInitSound(int32_t wav)
     }
 #endif // KAUAI_WIN32
 
+#if defined(KAUAI_SDL)
+
+    if ((pvNil != (psndv = SDLSoundDevice::PsdlsdNew())))
+    {
+        vpsndm->FAddDevice(kctgWave, psndv);
+        ReleasePpo(&psndv);
+    }
+
+#endif // KAUAI_SDL
+
     return fTrue;
 }
 

kauai/src/appbsdl.cpp

@@ -11,6 +11,8 @@
 #include "fcntl.h"
 #include "stdio.h"
 
+#include "sndsdl.h"
+
 ASSERTNAME
 
 WIG vwig;
@@ -306,6 +308,18 @@ void APPB::_DispatchEvt(PEVT pevt)
         else
             _pgobMouse = pvNil;
         break;
+    case SDL_USEREVENT_SOUND_FINISHED:
+        // Notify the sound player that the sound has finished
+        {
+            PSNDV psndv = vpsndm->PsndvFromCtg(kctgWave);
+            if (psndv != pvNil)
+            {
+                Assert(psndv->FIs(kclsSDLSoundDevice), "not a SDL sound device!");
+                PSDLSoundDevice psdlsd = (PSDLSoundDevice)psndv;
+                psdlsd->NotifyChannelFinished(pevt->user.code);
+            }
+        }
+        break;
     default:
         // ignore event
         break;