Merge svn changes up to r27123

Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c

1 files changed, 12 insertions, 0 deletions

diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index c4f71cdf65..754e6a11f4 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -134,14 +134,23 @@ 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,
+               ao_len, ao, ao_subdevice ? ao_subdevice : "[none]");
+
         for(i=0;audio_out_drivers[i];i++){
             const ao_functions_t* audio_out=audio_out_drivers[i];
             if(!strncmp(audio_out->info->short_name,ao,ao_len)){
                 // name matches, try it
                 if(audio_out->init(rate,channels,format,flags))
                     return audio_out; // success!
+                else
+                    mp_msg(MSGT_AO, MSGL_WARN, MSGTR_AO_FailedInit, 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);
         // continue...
         ++ao_list;
         if(!(ao_list[0])) return NULL; // do NOT fallback to others
@@ -150,6 +159,9 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate
         free(ao_subdevice);
         ao_subdevice = NULL;
     }
+
+    mp_msg(MSGT_AO, MSGL_V, MSGTR_AO_TryingEveryKnown);
+
     // now try the rest...
     for(i=0;audio_out_drivers[i];i++){
         const ao_functions_t* audio_out=audio_out_drivers[i];