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. Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-en.h Changes in other areas also in this revision: 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/man/cs/mplayer.1 trunk/DOCS/man/de/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/DOCS/tech/MAINTAINERS trunk/Makefile trunk/TOOLS/movinfo.c trunk/configure trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.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 trunk/libao2/audio_out.c Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/DOCS/man/en/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335) @@ -3026,10 +3026,6 @@ you really know how to set it correctly. .PD 1 . .TP -.B "alsa5\ \ " -ALSA 0.5 audio output driver -. -.TP .B "oss\ \ \ \ " OSS audio output driver .PD 0 Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/help/help_mp-en.h Wed Nov 9 02:22:02 2011 (r34335) @@ -1234,31 +1234,6 @@ static const char help_text[]= #define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Your audio driver DOES NOT support select() ***\nRecompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n" #define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nFatal error: *** CANNOT REOPEN / RESET AUDIO DEVICE (%s) ***\n" -// ao_alsa5.c -#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: requested format: %d Hz, %d channels, %s\n" -#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: no soundcards found.\n" -#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: invalid format (%s) requested - output disabled.\n" -#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: playback open error: %s\n" -#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: PCM info error: %s\n" -#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d soundcard(s) found, using: %s\n" -#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: PCM channel info error: %s\n" -#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: error setting parameters: %s\n" -#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: error setting up channel: %s\n" -#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: channel prepare error: %s\n" -#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: playback drain error: %s\n" -#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: playback flush error: %s\n" -#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: PCM close error: %s\n" -#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: playback drain error: %s\n" -#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: playback flush error: %s\n" -#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: channel prepare error: %s\n" -#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: playback drain error: %s\n" -#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: playback flush error: %s\n" -#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: channel prepare error: %s\n" -#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: alsa underrun, resetting stream.\n" -#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: playback prepare error: %s\n" -#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: write error after reset: %s - giving up.\n" -#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: output error: %s\n" - // ao_alsa.c #define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Invalid mixer index. Defaulting to 0.\n" #define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Mixer open error: %s\n" @@ -1751,12 +1726,12 @@ static const char help_text[]= // ================================== stream ==================================== -// ai_alsa1x.c -#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Cannot set samplerate.\n" -#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Cannot set buffer time.\n" -#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Cannot set period time.\n" +// ai_alsa.c +#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Cannot set samplerate.\n" +#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Cannot set buffer time.\n" +#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Cannot set period time.\n" -// ai_alsa1x.c / ai_alsa.c +// ai_alsa.c #define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Broken configuration for this PCM: no configurations available.\n" #define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Access type not available.\n" #define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Sample format not available.\n"