[MPlayer-cvslog] r34201 - in trunk: gui/interface.c mplayer.c

[ib]

Author: ib
Date: Sat Oct 15 12:37:36 2011
New Revision: 34201

Log:
Allow GUI to use filename related config.

The GUI provides MPlayer with the respective (next) filename to play
and playtree_iter is always NULL in connection with the GUI. MPlayer
must not clear the filename then, or else filename related config like
load_per_protocol_config(), load_per_extension_config() or
load_per_file_config() won't work.

The GUI sets filename NULL now if there is no further file to play.

Modified:
   trunk/gui/interface.c
   trunk/mplayer.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sat Oct 15 08:41:24 2011	(r34200)
+++ trunk/gui/interface.c	Sat Oct 15 12:37:36 2011	(r34201)
@@ -774,6 +774,8 @@ int gui(int what, void *data)
             if (guiInfo.NewPlay == GUI_FILE_NEW)
                 break;
 
+            filename = NULL;
+
             guiInfo.ElapsedTime   = 0;
             guiInfo.Position      = 0;
             guiInfo.AudioChannels = 0;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sat Oct 15 08:41:24 2011	(r34200)
+++ trunk/mplayer.c	Sat Oct 15 12:37:36 2011	(r34201)
@@ -4040,7 +4040,7 @@ goto_next_file:  // don't jump here afte
         (use_gui && guiInfo.Playing) ||
 #endif
                                         mpctx->playtree_iter != NULL || player_idle_mode) {
-        if (!mpctx->playtree_iter)
+        if (!mpctx->playtree_iter && !use_gui)
             filename = NULL;
         mpctx->eof = 0;
         goto play_next_file;