[MPlayer-cvslog] r35614 - trunk/gui/win32/interface.c

ib subversion at mplayerhq.hu
Thu Dec 6 00:12:53 CET 2012


Author: ib
Date: Thu Dec  6 00:12:53 2012
New Revision: 35614

Log:
Don't unnecessarily use global MPlayer variable filename in Win32 GUI.

Use a local variable instead.

(This has been forgotten in r35613.)

Modified:
   trunk/gui/win32/interface.c

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Wed Dec  5 23:55:02 2012	(r35613)
+++ trunk/gui/win32/interface.c	Thu Dec  6 00:12:53 2012	(r35614)
@@ -845,6 +845,7 @@ static int import_file_into_gui(char *pa
 int guiPlaylist (int what, play_tree_t *playtree, m_config_t *config, int enqueue)
 {
     play_tree_iter_t *pt_iter = NULL;
+    char *file;
     int added = FALSE;
 
     switch (what)
@@ -858,11 +859,11 @@ int guiPlaylist (int what, play_tree_t *
 
             if((pt_iter = pt_iter_create(&playtree, config)))
             {
-                while ((filename = pt_iter_get_next_file(pt_iter)) != NULL)
+                while ((file = pt_iter_get_next_file(pt_iter)) != NULL)
                 {
-                    if (parse_filename(filename, playtree, config, 0))
+                    if (parse_filename(file, playtree, config, 0))
                         added = TRUE;
-                    else if (import_file_into_gui(filename, 0)) /* Add it to end of list */
+                    else if (import_file_into_gui(file, 0)) /* Add it to end of list */
                         added = TRUE;
                 }
             }
@@ -885,8 +886,8 @@ int guiPlaylist (int what, play_tree_t *
 
             if((pt_iter = pt_iter_create(&playtree, config)))
             {
-                while ((filename = pt_iter_get_next_file(pt_iter)) != NULL)
-                    if (import_file_into_gui(filename, 1)) /* insert it into the list and set plCurrent = new item */
+                while ((file = pt_iter_get_next_file(pt_iter)) != NULL)
+                    if (import_file_into_gui(file, 1)) /* insert it into the list and set plCurrent = new item */
                         added = TRUE;
                 pt_iter_destroy(&pt_iter);
             }


More information about the MPlayer-cvslog mailing list