RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove special error message for -ao alsa1x and alsa9 

Those variants were removed in 2004. Remove the special handling of
those ao names and treat them like any other unrecognized ao name.
This removes a questionable exit_player() call.
This commit is contained in:
Uoti Urpala 2008-08-12 14:30:43 +03:00
parent 1ade57af4b
commit 9f7c6291a5
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
help/help_mp-en.h
View File

@ -1152,7 +1152,6 @@ static char help_text[]=
// ======================= audio output drivers ======================== // ======================= audio output drivers ========================
// audio_out.c // audio_out.c
#define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9 and alsa1x modules were removed, use -ao alsa instead.\n"
#define MSGTR_AO_TryingPreferredAudioDriver "Trying preferred audio driver '%.*s', options '%s'\n" #define MSGTR_AO_TryingPreferredAudioDriver "Trying preferred audio driver '%.*s', options '%s'\n"
#define MSGTR_AO_NoSuchDriver "No such audio driver '%.*s'\n" #define MSGTR_AO_NoSuchDriver "No such audio driver '%.*s'\n"
#define MSGTR_AO_FailedInit "Failed to initialize audio driver '%s'\n" #define MSGTR_AO_FailedInit "Failed to initialize audio driver '%s'\n"

5
libao2/audio_out.c
View File

@ -7,7 +7,6 @@
#include "mp_msg.h" #include "mp_msg.h"
#include "help_mp.h" #include "help_mp.h"
#include "mplayer.h" /* for exit_player() */
// there are some globals: // there are some globals:
ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};
@ -119,10 +118,6 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate
while(ao_list[0][0]){ while(ao_list[0][0]){
char* ao=ao_list[0]; char* ao=ao_list[0];
int ao_len; int ao_len;
if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
exit_player(NULL);
}
if (ao_subdevice) { if (ao_subdevice) {
free(ao_subdevice); free(ao_subdevice);
ao_subdevice = NULL; ao_subdevice = NULL;