[MPlayer-cvslog] r34156 - in trunk/gui: interface.c win32/interface.c

[ib]

Author: ib
Date: Thu Sep 29 15:52:19 2011
New Revision: 34156

Log:
Don't needlessly set filename in GUI_PREPARE.

The filename has already been set (by uiSetFileName()).

For gui/win32/interface.c there is no need to set it
in guiPlaylistInitialize() either.

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Sep 29 15:44:21 2011	(r34155)
+++ trunk/gui/interface.c	Thu Sep 29 15:52:19 2011	(r34156)
@@ -427,14 +427,6 @@ int gui(int what, void *data)
 #endif
         }
 
-// if ( guiInfo.StreamType != STREAMTYPE_PLAYLIST ) // Does not make problems anymore!
-        {
-            if (guiInfo.Filename)
-                filename = gstrdup(guiInfo.Filename);
-            else if (filename)
-                setdup(&guiInfo.Filename, filename);
-        }
-
         // video opts
 
         if (!video_driver_list) {

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Thu Sep 29 15:44:21 2011	(r34155)
+++ trunk/gui/win32/interface.c	Thu Sep 29 15:52:19 2011	(r34156)
@@ -488,7 +488,6 @@ int gui(int what, void *data)
                 }
 #endif
             }
-            filename = guiInfo.Filename;
             break;
         }
         case GUI_SET_AUDIO:
@@ -739,8 +738,7 @@ int guiPlaylistInitialize(play_tree_t *m
     if (result)
     {
         mygui->playlist->current = 0;
-        filename = mygui->playlist->tracks[0]->filename;
-        uiSetFileName(NULL, filename, STREAMTYPE_FILE);
+        uiSetFileName(NULL, mygui->playlist->tracks[0]->filename, STREAMTYPE_FILE);
     }
     return result;
 }