diff --git a/config.h.in b/config.h.in index 701731f..7a8d620 100644 --- a/config.h.in +++ b/config.h.in @@ -15,9 +15,6 @@ /* Define this if you want to Debug */ #undef DEBUG -/* default audio mode */ -#undef DEFAULT_AUDIO_MODE - /* Define this if you use cdrom iotctl in *BSD */ #undef ENABLE_CDROM_BSD diff --git a/configure b/configure index 5b86ccd..bbce178 100755 --- a/configure +++ b/configure @@ -869,8 +869,6 @@ enable_sdl with_sdl_prefix with_sdl_exec_prefix enable_sdltest -enable_audio -with_default_output enable_cdrom with_cdromdev with_locale @@ -1556,9 +1554,6 @@ Optional Features: --disable-gtktest do not try to compile and run a test GTK+ program --enable-sdl SDL default=no --disable-sdltest Do not try to compile and run a test SDL program - --enable-audio=mode_list Enable audio (Specify comma separated mode list): - default: Automatically select audio device. - sdlmixer: SDL mixer --enable-cdrom=mode_list Enable CD-adio (Specify comma separated mode list): (default: Automatically select cdrom device) linux: linux API (Linux/Solaris) @@ -1600,8 +1595,6 @@ Optional Packages: --with-x use the X Window System --with-sdl-prefix=PFX Prefix where SDL is installed (optional) --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional) - --with-default-output= Specify default output mode (optional): - default|sdl --with-cdromdev=# CDROM Device Name. [default=/dev/cdrom] --with-locale=LOCALE locale name you want to use(ex. ja_JP.ujis) --with-midi-player=xxx External Midi Player default=playmidi -4 @@ -16470,66 +16463,6 @@ fi -# Check whether --enable-audio was given. -if test "${enable_audio+set}" = set; then : - enableval=$enable_audio; enable_audio=$enableval -else - enable_audio=yes -fi - - -test "x$enable_audio" = xyes && enable_audio=default - -if test "x$enable_audio" != xno; then - for i in `echo $enable_audio | sed 's/,/ /g'`; do - eval "enable_$i=yes" - done - if test "x$enable_default" = xyes; then - enable_audio=default - fi -fi - -if test "x$enable_audio" = xdefault; then - enable_sdlmixer=yes -fi - - -DEFAULT_PLAYMODE= - -# Check whether --with-default-output was given. -if test "${with_default_output+set}" = set; then : - withval=$with_default_output; if test "$enable_audio" != no; then - DEFAULT_PLAYMODE=$withval - eval "enable_$DEFAULT_PLAYMODE=yes" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-default-output=$withval: audio is not enabled" >&5 -$as_echo "$as_me: WARNING: --with-default-output=$withval: audio is not enabled" >&2;} - fi - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default output mode" >&5 -$as_echo_n "checking default output mode... " >&6; } -if test "x$DEFAULT_PLAYMODE" = x; then - DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` -fi -case ".$DEFAULT_PLAYMODE" in - .default) def_am=AUDIO_PCM_ANY ;; - .sdl) def_am=AUDIO_PCM_SDL ;; - *) def_am= ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $def_am" >&5 -$as_echo "$def_am" >&6; } -if test "x$def_am" != x; then - -cat >>confdefs.h <<_ACEOF -#define DEFAULT_AUDIO_MODE $def_am -_ACEOF - -fi - - - SRC_AUDIO= if test "x$have_sdl" = xyes; then SRC_AUDIO="$SRC_AUDIO audio_sdl.c" diff --git a/configure.ac b/configure.ac index 0030d35..c74c37b 100644 --- a/configure.ac +++ b/configure.ac @@ -199,63 +199,6 @@ fi AC_SUBST(SRC_GRAPHDEV) -dnl -dnl audio check -dnl -AC_ARG_ENABLE(audio, - [ --enable-audio[=mode_list] Enable audio (Specify comma separated mode list): - default: Automatically select audio device. - sdlmixer: SDL mixer], - [ enable_audio=$enableval], - [ enable_audio=yes]) - -dnl yes -> default -test "x$enable_audio" = xyes && enable_audio=default - -if test "x$enable_audio" != xno; then - for i in `echo $enable_audio | sed 's/,/ /g'`; do - eval "enable_$i=yes" - done - if test "x$enable_default" = xyes; then - enable_audio=default - fi -fi - -if test "x$enable_audio" = xdefault; then - enable_sdlmixer=yes -fi - - -dnl -dnl Turn on default audio output mode -dnl -DEFAULT_PLAYMODE= -AC_ARG_WITH(default-output, - [ --with-default-output= Specify default output mode (optional): - default|sdl], - [ if test "$enable_audio" != no; then - DEFAULT_PLAYMODE=$withval - eval "enable_$DEFAULT_PLAYMODE=yes" - else - AC_MSG_WARN(--with-default-output=$withval: audio is not enabled) - fi] -) -AC_MSG_CHECKING(default output mode) -if test "x$DEFAULT_PLAYMODE" = x; then - DEFAULT_PLAYMODE=`echo $enable_audio | sed 's/,.*//'` -fi -case ".$DEFAULT_PLAYMODE" in - .default) def_am=AUDIO_PCM_ANY ;; - .sdl) def_am=AUDIO_PCM_SDL ;; - *) def_am= ;; -esac -AC_MSG_RESULT($def_am) -if test "x$def_am" != x; then - AC_DEFINE_UNQUOTED(DEFAULT_AUDIO_MODE, $def_am, [default audio mode]) -fi - - - dnl dnl Audio dnl diff --git a/src/audio.c b/src/audio.c index a393580..00fc78c 100644 --- a/src/audio.c +++ b/src/audio.c @@ -37,11 +37,7 @@ /* static variable */ static boolean mode_onlyone = FALSE; /* if true, only probe selected device */ -#ifdef DEFAULT_AUDIO_MODE -static int mode = DEFAULT_AUDIO_MODE; -#else static int mode = AUDIO_PCM_ANY; -#endif #ifdef ENABLE_SDL extern int sdlaudio_init();