[MPlayer-cvslog] r35578 - in trunk/gui: interface.c ui/main.c

[ib]

Author: ib
Date: Mon Dec  3 15:10:12 2012
New Revision: 35578

Log:
Set filename for MPlayer in GUI_PREPARE.

This allows to remove some ugly code from uiEventHandling() (evPlay)
whose sole purpose was setting the global filename variable.

For CD, VCD and DVD this is (indirectly) done in GUI_PREPARE, too,
so do it here for FILE and STREAM as well.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/main.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Dec  3 15:04:43 2012	(r35577)
+++ trunk/gui/interface.c	Mon Dec  3 15:10:12 2012	(r35578)
@@ -414,6 +414,7 @@ int gui(int what, void *data)
         switch (guiInfo.StreamType) {
         case STREAMTYPE_FILE:
         case STREAMTYPE_STREAM:
+            filename = guiInfo.Filename;
             break;
 
         case STREAMTYPE_CDDA:

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Mon Dec  3 15:04:43 2012	(r35577)
+++ trunk/gui/ui/main.c	Mon Dec  3 15:10:12 2012	(r35578)
@@ -208,12 +208,6 @@ play:
 
         if ( ( msg == evPlaySwitchToPause )&&( guiInfo.Playing == GUI_PAUSE ) ) goto NoPause;
 
-	if ( isPlaylistStreamtype && listMgr( PLAYLIST_ITEM_GET_CURR,0 ) )
-	 {
-	  plItem * curr = listMgr( PLAYLIST_ITEM_GET_CURR,0 );
-	  uiSetFile( curr->path,curr->name,SAME_STREAMTYPE );
-	 }
-
         switch ( guiInfo.StreamType )
          {
 	  case STREAMTYPE_FILE: