summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-12 14:30:43 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-12 14:57:18 +0300
commit9f7c6291a525b62628360166f8313db6904fb44e (patch)
tree580f62d7a4db7a2ad2d81e328da53747f7a9a777 /libao2
parent1ade57af4bd671ed58ab6de897ff3f07b4363e76 (diff)
downloadmpv-9f7c6291a525b62628360166f8313db6904fb44e.tar.bz2
mpv-9f7c6291a525b62628360166f8313db6904fb44e.tar.xz
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.
Diffstat (limited to 'libao2')
-rw-r--r--libao2/audio_out.c5
1 files changed, 0 insertions, 5 deletions
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;