[MPlayer-cvslog] r36504 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Sat Nov  9 09:46:02 2013
New Revision: 36504

Log:
Prefer -title if given for audio output name.

Implements bugzilla #2162.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sat Nov  9 09:46:01 2013	(r36503)
+++ trunk/mplayer.c	Sat Nov  9 09:46:02 2013	(r36504)
@@ -3649,7 +3649,7 @@ goto_enable_cache:
             if (mpctx->sh_audio && mpctx->sh_audio->codec)
                 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name);
             if (mpctx->audio_out)
-                mpctx->audio_out->control(AOCONTROL_FILENAME, (void *)mp_basename(filename));
+                mpctx->audio_out->control(AOCONTROL_FILENAME, vo_wintitle ? vo_wintitle : (void *)mp_basename(filename));
         }
 
         current_module = "av_init";