Author: diego Date: Wed Nov 9 02:22:02 2011 New Revision: 34335 Log: Remove obsolete ALSA 0.5 audio output and ALSA 0.9 audio input. ALSA 0.5 was last released in 2000, 0.9 in 2003; besides the ALSA 0.9 and 1.x audio inputs heavily duplicated code. Replaced: trunk/stream/ai_alsa.c - copied, changed from r34301, trunk/stream/ai_alsa1x.c Deleted: trunk/libao2/ao_alsa5.c trunk/stream/ai_alsa1x.c Modified: trunk/DOCS/tech/MAINTAINERS trunk/Makefile trunk/TOOLS/movinfo.c trunk/configure trunk/libao2/audio_out.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/cs/mplayer.1 trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 trunk/DOCS/man/es/mplayer.1 trunk/DOCS/man/fr/mplayer.1 trunk/DOCS/man/hu/mplayer.1 trunk/DOCS/man/it/mplayer.1 trunk/DOCS/man/pl/mplayer.1 trunk/DOCS/man/ru/mplayer.1 trunk/DOCS/man/zh_CN/mplayer.1 trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/DOCS/tech/MAINTAINERS Wed Nov 9 02:22:02 2011 (r34335) @@ -201,7 +201,6 @@ libvo drivers: * w32_common.c - Reimar Döffinger libao2 drivers: - * ao_alsa5.c - None * ao_alsa.c - Clemens Ladisch * ao_arts.c - None * ao_coreaudio.c - None Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/Makefile Wed Nov 9 02:22:02 2011 (r34335) @@ -33,8 +33,7 @@ OS_FEATURE-$(STRSEP) += OS_FEATURE-$(VSSCANF) += osdep/vsscanf.c # conditional source declarations -SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c -SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c +SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c @@ -496,9 +495,7 @@ SRCS_COMMON = asxparser.c \ SRCS_MPLAYER-$(3DFX) += libvo/vo_3dfx.c SRCS_MPLAYER-$(AA) += libvo/vo_aa.c -SRCS_MPLAYER-$(ALSA1X) += libao2/ao_alsa.c -SRCS_MPLAYER-$(ALSA5) += libao2/ao_alsa5.c -SRCS_MPLAYER-$(ALSA9) += libao2/ao_alsa.c +SRCS_MPLAYER-$(ALSA) += libao2/ao_alsa.c SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c Modified: trunk/TOOLS/movinfo.c ============================================================================== --- trunk/TOOLS/movinfo.c Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/TOOLS/movinfo.c Wed Nov 9 02:22:02 2011 (r34335) @@ -182,8 +182,10 @@ static void lschunks(FILE *f,int level,u if(atom_size<8) break; // error - printf("%08X: %*s %.4s (%08X) %05d [%s] (begin: %08X)\n",pos,level*2,"",&atom_type,atom_type,atom_size, - atom2human_type(atom_type), pos+8); // 8: atom_size fields (4) + atom_type fields (4) + printf("%08X: %*s %.4s (%08X) %05d [%s] (begin: %08X)\n", + pos, level * 2, "", &atom_type, atom_type, + atom_size, atom2human_type(atom_type), + pos + 8); // 8: atom_size fields (4) + atom_type fields (4) #ifndef NO_SPECIAL // if (atom_type == 0x61746475) Modified: trunk/configure ============================================================================== --- trunk/configure Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/configure Wed Nov 9 02:22:02 2011 (r34335) @@ -5494,44 +5494,32 @@ if test "$_alloca" != yes ; then fi if test "$_alsa" != no ; then _alsa=no - cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)' -lasound $ld_dl $ld_pthread && _alsaver='0.5.x' cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-sys' cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-alsa' cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-sys' cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-alsa' fi def_alsa='#undef CONFIG_ALSA' -def_alsa5='#undef CONFIG_ALSA5' def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then _alsa=yes - if test "$_alsaver" = '0.5.x' ; then - _alsa5=yes - aomodules="alsa5 $aomodules" - def_alsa5='#define CONFIG_ALSA5 1' - def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' - res_comment="using alsa 0.5.x and sys/asoundlib.h" - elif test "$_alsaver" = '0.9.x-sys' ; then - _alsa9=yes + if test "$_alsaver" = '0.9.x-sys' ; then aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then - _alsa9=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then - _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then - _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' @@ -7276,7 +7264,7 @@ echocheck "Radio interface" if test "$_radio" = yes ; then def_radio='#define CONFIG_RADIO 1' inputmodules="radio $inputmodules" - if test "$_alsa9" != yes -a "$_alsa1x" != yes -a "$_ossaudio" != yes ; then + if test "$_alsa" != yes -a "$_ossaudio" != yes ; then _radio_capture=no fi if test "$_radio_capture" = yes ; then @@ -8037,9 +8025,7 @@ VSSCANF = $vsscanf # features 3DFX = $_3dfx AA = $_aa -ALSA1X = $_alsa1x -ALSA9 = $_alsa9 -ALSA5 = $_alsa5 +ALSA = $_alsa APPLE_IR = $_apple_ir APPLE_REMOTE = $_apple_remote ARTS = $_arts @@ -8319,9 +8305,7 @@ cat > $TMPH << EOF */ #define CONFIG_FAKE_MONO 1 -/* set up max. outburst. use 131072 for TrueHD SPDIF pass-through, - * use 65536 for ALSA 0.5, for others 16384 is enough - */ +/* set up max. outburst. use 131072 for TrueHD SPDIF pass-through */ #define MAX_OUTBURST 131072 /* set up audio OUTBURST. Do not change this! */ @@ -8519,7 +8503,6 @@ $def_xshape /* Audio output drivers */ $def_alsa -$def_alsa5 $def_arts $def_coreaudio $def_dart Modified: trunk/libao2/audio_out.c ============================================================================== --- trunk/libao2/audio_out.c Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/libao2/audio_out.c Wed Nov 9 02:22:02 2011 (r34335) @@ -39,7 +39,6 @@ extern const ao_functions_t audio_out_pu extern const ao_functions_t audio_out_jack; extern const ao_functions_t audio_out_openal; extern const ao_functions_t audio_out_null; -extern const ao_functions_t audio_out_alsa5; extern const ao_functions_t audio_out_alsa; extern const ao_functions_t audio_out_nas; extern const ao_functions_t audio_out_sdl; @@ -80,9 +79,6 @@ const ao_functions_t* const audio_out_dr #ifdef CONFIG_ALSA &audio_out_alsa, #endif -#ifdef CONFIG_ALSA5 - &audio_out_alsa5, -#endif #ifdef CONFIG_SGI_AUDIO &audio_out_sgi, #endif Copied and modified: trunk/stream/ai_alsa.c (from r34301, trunk/stream/ai_alsa1x.c) ============================================================================== --- trunk/stream/ai_alsa1x.c Fri Nov 4 16:22:51 2011 (r34301, copy source) +++ trunk/stream/ai_alsa.c Wed Nov 9 02:22:02 2011 (r34335) @@ -72,7 +72,7 @@ int ai_alsa_setup(audio_in_t *ai) rate = ai->req_samplerate; err = snd_pcm_hw_params_set_rate_near(ai->alsa.handle, params, &rate, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate); } ai->samplerate = rate; @@ -81,7 +81,7 @@ int ai_alsa_setup(audio_in_t *ai) err = snd_pcm_hw_params_set_buffer_time_near(ai->alsa.handle, params, &ai->alsa.buffer_time, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime); } dir = 0; @@ -89,7 +89,7 @@ int ai_alsa_setup(audio_in_t *ai) err = snd_pcm_hw_params_set_period_time_near(ai->alsa.handle, params, &ai->alsa.period_time, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime); } err = snd_pcm_hw_params(ai->alsa.handle, params);