Mercurial > mplayer.hg

changeset 34068:c3b22e92a4ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Thu, 29 Sep 2011 13:52:19 +0000
parents eb6344ee99ac
children 5c505f79932d
files gui/interface.c gui/win32/interface.c
diffstat 2 files changed, 1 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Thu Sep 29 13:44:21 2011 +0000
+++ b/gui/interface.c	Thu Sep 29 13:52:19 2011 +0000
@@ -427,14 +427,6 @@
 #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) {
--- a/gui/win32/interface.c	Thu Sep 29 13:44:21 2011 +0000
+++ b/gui/win32/interface.c	Thu Sep 29 13:52:19 2011 +0000
@@ -488,7 +488,6 @@
                 }
 #endif
             }
-            filename = guiInfo.Filename;
             break;
         }
         case GUI_SET_AUDIO:
@@ -739,8 +738,7 @@
     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;
 }