diff options
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r-- | libao2/audio_out.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 4ac5489d0e..aaba6a90e5 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -25,7 +25,6 @@ #include "mp_msg.h" #include "help_mp.h" -#include "mp_core.h" /* for exit_player() */ // there are some globals: ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; @@ -129,7 +128,7 @@ const ao_functions_t* const audio_out_drivers[] = void list_audio_out(void){ int i=0; - mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); + mp_tmsg(MSGT_AO, MSGL_INFO, "Available audio output drivers:\n"); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_OUTPUTS\n"); while (audio_out_drivers[i]) { const ao_info_t *info = audio_out_drivers[i++]->info; @@ -145,10 +144,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(EXIT_NONE); - } if (ao_subdevice) { free(ao_subdevice); ao_subdevice = NULL; @@ -161,7 +156,7 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate else ao_len = strlen(ao); - mp_msg(MSGT_AO, MSGL_V, MSGTR_AO_TryingPreferredAudioDriver, + mp_tmsg(MSGT_AO, MSGL_V, "Trying preferred audio driver '%.*s', options '%s'\n", ao_len, ao, ao_subdevice ? ao_subdevice : "[none]"); for(i=0;audio_out_drivers[i];i++){ @@ -171,12 +166,12 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate if(audio_out->init(rate,channels,format,flags)) return audio_out; // success! else - mp_msg(MSGT_AO, MSGL_WARN, MSGTR_AO_FailedInit, ao); + mp_tmsg(MSGT_AO, MSGL_WARN, "Failed to initialize audio driver '%s'\n", ao); break; } } if (!audio_out_drivers[i]) // we searched through the entire list - mp_msg(MSGT_AO, MSGL_WARN, MSGTR_AO_NoSuchDriver, ao_len, ao); + mp_tmsg(MSGT_AO, MSGL_WARN, "No such audio driver '%.*s'\n", ao_len, ao); // continue... ++ao_list; if(!(ao_list[0])) return NULL; // do NOT fallback to others @@ -186,7 +181,7 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate ao_subdevice = NULL; } - mp_msg(MSGT_AO, MSGL_V, MSGTR_AO_TryingEveryKnown); + mp_tmsg(MSGT_AO, MSGL_V, "Trying every known audio driver...\n"); // now try the rest... for(i=0;audio_out_drivers[i];i++){ |