diff options
| -rw-r--r-- | help/help_mp-en.h | 1 | ||||
| -rw-r--r-- | libao2/audio_out.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 5a82a3943f..311927fb03 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -1152,7 +1152,6 @@ static char help_text[]= // ======================= audio output drivers ======================== // 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_NoSuchDriver "No such audio driver '%.*s'\n" #define MSGTR_AO_FailedInit "Failed to initialize audio driver '%s'\n" diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 38fad281be..71ebf94c82 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -7,7 +7,6 @@ #include "mp_msg.h" #include "help_mp.h" -#include "mplayer.h" /* for exit_player() */ // there are some globals: 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]){ char* ao=ao_list[0]; 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) { free(ao_subdevice); ao_subdevice = NULL; |