Re: [Gnash-dev] SDL audio replacing..

[Rob Savoye]

On Fri, Jun 19, 2009 at 06:06:56PM +0200, Andrea Palmat? wrote:
> Andrea Palmat? ha scritto:
> >Can someone could try this patch to see if all is correct?
> >
> there are a lot of other things in configure.ac that must be changed. 
> for example

 Try this version. I'm at a conference right now, so I'll test this more
later. 

=== modified file 'configure.ac'
--- configure.ac        2009-06-18 08:46:14 +0000
+++ configure.ac        2009-06-19 14:50:35 +0000
@@ -726,6 +726,29 @@
 fi
 
 dnl --------------------------------------------------------
+dnl  Select sound handler
+dnl --------------------------------------------------------
+sound_handler=
+AC_ARG_ENABLE(sound,
+ AC_HELP_STRING([--enable-sound=handler], [Enable sound handling support
using the specified handler: sdl, aos4 ]),
+ [case "${enableval}" in
+   SDL|sdl)
+     sound_handler=sdl
+     ;;
+   aos4|aos4)
+     sound_handler=aos4
+     ;;
+   *) AC_MSG_ERROR([bad value ${enableval} for --enable-sound option]) ;;
+  esac],
+ [sound_handler=sdl]
+)
+
+dnl If we're using the AOS4 gui, we want to use the AOS4 sound handler
+if test x$build_aos4 = xyes; then
+   sound_handler=aos4
+fi
+
+dnl --------------------------------------------------------
 dnl  Select media handler
 dnl --------------------------------------------------------
 
@@ -1993,13 +2016,16 @@
 
 AM_CONDITIONAL(HAVE_CAIRO, [test x"${CAIRO_LIBS}" != x])
 
-AM_CONDITIONAL(USE_SOUND_SDL, test x"$media_handler" = xffmpeg -o
x"$media_handler" = xgst)
+AM_CONDITIONAL(USE_SOUND_SDL, test x"$sound_handler" = xsdl)
+AM_CONDITIONAL(USE_SOUND_AOS4, test x"$sound_handler" = xaos4)
+
 AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x"$media_handler" = xffmpeg)
 AM_CONDITIONAL(USE_GST_ENGINE, test x"$media_handler" = xgst)
 AM_CONDITIONAL(HAVE_OPENGL, test x"${OPENGL_LIBS}" != x)
 
-case "${media_handler}" in
-  ffmpeg|gst) AC_DEFINE([SOUND_SDL],  [1], [Use SDL for sound handling]) ;;
+case "${sound_handler}" in
+  sdl) AC_DEFINE([SOUND_SDL],    [1], [Use SDL for sound handling]) ;;
+  aos4) AC_DEFINE([SOUND_AOS4],  [1], [Use SDL for sound handling]) ;;
   *)
 
        - rob -