removing ao_alsa9.c and ao_alsa1x.c as they are superseded by ao_alsa.c

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13543 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-10-04 15:10:33 +00:00
parent 640de038f8
commit 6e4d643f3c
4 changed files with 8 additions and 2373 deletions

View File

@ -799,6 +799,9 @@ static char help_text[]=
// libao2
// audio_out.c
#define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9 and alsa1x modules were removed, use -ao alsa instead.\n"
// ao_oss.c
#define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Can't open mixer device %s: %s\n"
#define MSGTR_AO_OSS_ChanNotFound "[AO OSS] audio_setup: Audio card mixer does not have channel '%s' using default.\n"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -138,6 +138,11 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c
if(ao_list && ao_list[0])
while(ao_list[0][0]){
char* ao=strdup(ao_list[0]);
if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
free(ao);
exit_player(NULL);
}
ao_subdevice=strchr(ao,':');
if(ao_subdevice){
ao_subdevice[0]=0;