[MPlayer-cvslog] r35475 - in trunk/gui: interface.c ui/gtk/playlist.c

[ib]

Author: ib
Date: Sun Nov 25 15:38:58 2012
New Revision: 35475

Log:
Without current playlist item, reset guiInfo's Filename and StreamType.

This fixes a blocking when deleting the playlist while or after playback
and trying to play again.

Reported by Hans-Dieter Kosch, hdkosch kabelbw de.

(Reset them either after playback when playing or immediately if not
playing which will display the filename played as long as possible.)

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/gtk/playlist.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Nov 25 15:18:12 2012	(r35474)
+++ trunk/gui/interface.c	Sun Nov 25 15:38:58 2012	(r35475)
@@ -789,6 +789,11 @@ int gui(int what, void *data)
 
             filename = NULL;
 
+            if (!listMgr(PLAYLIST_ITEM_GET_CURR, 0) &&
+                (guiInfo.StreamType == STREAMTYPE_FILE ||
+                 guiInfo.StreamType == STREAMTYPE_STREAM))
+                uiSetFileName(NULL, NULL, STREAMTYPE_DUMMY);
+
             guiInfo.ElapsedTime   = 0;
             guiInfo.Position      = 0;
             guiInfo.AudioChannels = 0;

Modified: trunk/gui/ui/gtk/playlist.c
==============================================================================
--- trunk/gui/ui/gtk/playlist.c	Sun Nov 25 15:18:12 2012	(r35474)
+++ trunk/gui/ui/gtk/playlist.c	Sun Nov 25 15:38:58 2012	(r35475)
@@ -32,6 +32,7 @@
 #include "stream/stream.h"
 
 #include "gui/cfg.h"
+#include "gui/interface.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"
@@ -215,6 +216,7 @@ static void plButtonReleased( GtkButton 
 //	  guiInfo.NewPlay=GUI_FILE_NEW;
 //	  guiInfo.StreamType=STREAMTYPE_FILE;
 	 }
+	else if (!guiInfo.Playing) uiSetFileName(NULL, NULL, STREAMTYPE_DUMMY);
        }
   case 0: // cancel
        HidePlayList();