SDL: use OSS audio backend

Instead of using Genode's Audio_out specific backend follow our SDL2 port in using an already existing backend, e.g., OSS. So far only the chocolate-doom SDL1 port was tested but the other pkg were adapted as well. Issue genodelabs#362.
cnuke · Apr 10, 2024 · 5cfbbae · 5cfbbae
1 parent db17526
commit 5cfbbae
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 357 deletions.
diff --git a/include/SDL/SDL_config_genode.h b/include/SDL/SDL_config_genode.h
@@ -38,8 +38,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-/* Enable the Genode audio driver */
-#define SDL_AUDIO_DRIVER_GENODE 1
+/* Enable the OSS audio driver */
+#define SDL_AUDIO_DRIVER_OSS 1
 
 /* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
 #define SDL_CDROM_DUMMY 1

diff --git a/lib/mk/sdl.mk b/lib/mk/sdl.mk
@@ -21,7 +21,6 @@ endif
 # backends
 SRC_CC   = video/SDL_genode_fb_video.cc \
            video/SDL_genode_fb_events.cc \
-           audio/SDL_genodeaudio.cc \
            loadso/SDL_loadso.cc
 
 INC_DIR += $(REP_DIR)/include/SDL \
@@ -65,8 +64,12 @@ SRC_C += $(addprefix events/,$(notdir $(wildcard $(SDL_DIR)/src/events/*.c)))
 INC_DIR += $(SDL_DIR)/src/events
 
 # audio subsystem
-SRC_C += $(addprefix audio/,$(notdir $(wildcard $(SDL_DIR)/src/audio/*.c)))
-INC_DIR += $(SDL_DIR)/src/audio
+SRC_C += $(addprefix audio/,$(notdir $(wildcard $(SDL_DIR)/src/audio/*.c))) \
+         audio/dma/SDL_dmaaudio.c \
+         audio/dsp/SDL_dspaudio.c
+INC_DIR += $(SDL_DIR)/src/audio \
+           $(SDL_DIR)/src/audio/dma \
+           $(SDL_DIR)/src/audio/dsp
 
 # file I/O subsystem
 SRC_C   += file/SDL_rwops.c

diff --git a/ports/sdl.hash b/ports/sdl.hash
@@ -1 +1 @@
-8543c5f3448ebea97afa84aee6691e38a78e756e
+0b8312de81a4666483082057cb84f0add09fe30d
diff --git a/ports/sdl.port b/ports/sdl.port
@@ -8,7 +8,7 @@ SIG(sdl) := ${URL(sdl)}.sig
 KEY(sdl) := 1528635D8053A57F77D1E08630A59377A7763BE6
 DIR(sdl) := src/lib/sdl
 
-PATCHES   := src/lib/sdl/SDL_video.patch src/lib/sdl/SDL_audio.patch
+PATCHES   := src/lib/sdl/SDL_video.patch
 
 # wipe original 'SDL_config.h' file because it conflicts with out version
 _dirs: remove_default_config

diff --git a/recipes/pkg/abuse/archives b/recipes/pkg/abuse/archives
@@ -8,5 +8,6 @@ _/src/sdl_mixer
 _/src/sdl_net
 _/src/stdcxx
 _/src/vfs
+_/src/vfs_oss
 _/src/libpng
 _/src/zlib
diff --git a/recipes/pkg/abuse/runtime b/recipes/pkg/abuse/runtime
@@ -1,7 +1,7 @@
 <runtime ram="64M" caps="512" binary="abuse">
 
 	<requires>
-		<audio_out/>
+		<play/>
 		<file_system/>
 		<gui/>
 		<timer/>
@@ -22,6 +22,7 @@
 		<rom label="sdl_net.lib.so"/>
 		<rom label="stdcxx.lib.so"/>
 		<rom label="vfs.lib.so"/>
+		<rom label="vfs_oss.lib.so"/>
 		<rom label="zlib.lib.so"/>
 	</content>
 
@@ -32,6 +33,7 @@
 			<fs/>
 			<dir name="dev">
 				<log/> <rtc/>
+				<oss name="dsp" record_enabled="false"/>
 			</dir>
 		</vfs>
 		<arg value="abuse"/>

diff --git a/recipes/pkg/avplay/archives b/recipes/pkg/avplay/archives
@@ -3,4 +3,5 @@ _/src/libc
 _/src/libav
 _/src/sdl
 _/src/vfs
+_/src/vfs_oss
 _/src/zlib
diff --git a/recipes/pkg/avplay/runtime b/recipes/pkg/avplay/runtime
@@ -3,14 +3,15 @@
 	<requires>
 		<file_system label="input"/>
 		<gui/>
-		<audio_out/>
+		<play/>
 		<timer/>
 	</requires>
 
 	<content>
 		<rom label="avplay"/>
 		<rom label="libc.lib.so"/>
 		<rom label="vfs.lib.so"/>
+		<rom label="vfs_oss.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="zlib.lib.so"/>
 		<rom label="sdl.lib.so"/>
@@ -26,11 +27,11 @@
 	<config>
 		<arg value="avplay"/>
 		<arg value="input/mediafile"/>
-		<sdl_audio_volume value="100"/>
 		<libc rtc="/dev/rtc" stdout="/dev/log" stderr="/dev/log"/>
 		<vfs>
 			<dir name="dev">
 				<log/> <inline name="rtc">2000-01-01 00:00</inline>
+				<oss name="dsp" record_enabled="false"/>
 			</dir>
 			<dir name="input"> <fs label="input"/> </dir>
 		</vfs>

diff --git a/recipes/pkg/tyrian/archives b/recipes/pkg/tyrian/archives
@@ -4,3 +4,4 @@ _/src/opentyrian
 _/src/sdl
 _/src/sdl_net
 _/src/vfs
+_/src/vfs_oss
diff --git a/recipes/pkg/tyrian/runtime b/recipes/pkg/tyrian/runtime
@@ -1,7 +1,7 @@
 <runtime ram="64M" caps="512" binary="opentyrian">
 
 	<requires>
-		<audio_out/>
+		<play/>
 		<file_system/>
 		<gui/>
 		<timer/>
@@ -17,6 +17,7 @@
 		<rom label="sdl_net.lib.so"/>
 		<rom label="tyrian.tar"/>
 		<rom label="vfs.lib.so"/>
+		<rom label="vfs_oss.lib.so"/>
 	</content>
 
 	<config>
@@ -26,6 +27,7 @@
 			<fs/>
 			<dir name="dev">
 				<log/> <rtc/>
+				<oss name="dsp" record_enabled="false"/>
 			</dir>
 		</vfs>
 	</config>

diff --git a/recipes/src/avplay/used_apis b/recipes/src/avplay/used_apis
@@ -6,6 +6,5 @@ libc
 vfs
 libav
 sdl
-audio_out_session
 framebuffer_session
 input_session
diff --git a/src/lib/sdl/SDL_audio.patch b/src/lib/sdl/SDL_audio.patch
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8543c5f3448ebea97afa84aee6691e38a78e756e
		0b8312de81a4666483082057cb84f0add09fe30d