[MPlayer-cvslog] r34153 - in trunk/gui: interface.c ui/gtk/fileselect.c win32/interface.c

[ib]

Author: ib
Date: Thu Sep 29 15:35:31 2011
New Revision: 34153

Log:
Change guiInfo.Filename by using uiSetFileName() only.

The two nfree() may be omitted, because they are performed
in uiSetFileName().

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/gtk/fileselect.c
   trunk/gui/win32/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Sep 29 15:26:32 2011	(r34152)
+++ trunk/gui/interface.c	Thu Sep 29 15:35:31 2011	(r34153)
@@ -406,7 +406,7 @@ int gui(int what, void *data)
             char tmp[512];
 
             sprintf(tmp, "vcd://%d", guiInfo.Track);
-            setdup(&guiInfo.Filename, tmp);
+            uiSetFileName(NULL, tmp, STREAMTYPE_VCD);
         }
         break;
 #endif
@@ -417,7 +417,7 @@ int gui(int what, void *data)
             char tmp[512];
 
             sprintf(tmp, "dvd://%d", guiInfo.Track);
-            setdup(&guiInfo.Filename, tmp);
+            uiSetFileName(NULL, tmp, STREAMTYPE_DVD);
         }
 
             dvd_chapter = guiInfo.Chapter;
@@ -768,11 +768,8 @@ int gui(int what, void *data)
 
         if (guiInfo.Playing && (next = listSet(gtkGetNextPlItem, NULL)) && (plLastPlayed != next)) {
             plLastPlayed = next;
-            setddup(&guiInfo.Filename, next->path, next->name);
-            guiInfo.StreamType = STREAMTYPE_FILE;
+            uiSetFileName(next->path, next->name, STREAMTYPE_FILE);
             guiInfo.NewPlay    = GUI_FILE_NEW;
-            nfree(guiInfo.AudioFilename);
-            nfree(guiInfo.SubtitleFilename);
             guiInfo.Track++;
         } else {
             if (guiInfo.NewPlay == GUI_FILE_NEW)

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Thu Sep 29 15:26:32 2011	(r34152)
+++ trunk/gui/ui/gtk/fileselect.c	Thu Sep 29 15:35:31 2011	(r34153)
@@ -489,11 +489,8 @@ static void fs_Ok_released( GtkButton * 
  switch ( fsType )
   {
    case fsVideoSelector:
-          setddup( &guiInfo.Filename,fsSelectedDirectory,fsSelectedFile );
-          guiInfo.StreamType=STREAMTYPE_FILE;
+          uiSetFileName( fsSelectedDirectory,fsSelectedFile,STREAMTYPE_FILE );
           guiInfo.NewPlay=GUI_FILE_NEW; sub_fps=0;
-	  nfree( guiInfo.AudioFilename );
-	  nfree( guiInfo.SubtitleFilename );
           fs_PersistantHistory( get_current_dir_name_utf8() );      //totem, write into history
           break;
    case fsSubtitleSelector:

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Thu Sep 29 15:26:32 2011	(r34152)
+++ trunk/gui/win32/interface.c	Thu Sep 29 15:35:31 2011	(r34153)
@@ -457,7 +457,7 @@ int gui(int what, void *data)
             dvd_title = 0;
             force_fps = 0;
             if(!mygui->playlist->tracks) return 0;
-            setdup(&guiInfo.Filename, mygui->playlist->tracks[mygui->playlist->current]->filename);
+            uiSetFileName(NULL, mygui->playlist->tracks[mygui->playlist->current]->filename, STREAMTYPE_FILE);
             guiInfo.Track = mygui->playlist->current + 1;
             if(gtkAONorm) greplace(&af_cfg.list, "volnorm", "volnorm");
             if(gtkAOExtraStereo)
@@ -483,7 +483,7 @@ int gui(int what, void *data)
                     dvd_chapter = guiInfo.Chapter;
                     dvd_angle = guiInfo.Angle;
                     sprintf(tmp,"dvd://%d", guiInfo.Track);
-                    setdup(&guiInfo.Filename, tmp);
+                    uiSetFileName(NULL, tmp, STREAMTYPE_DVD);
                     break;
                 }
 #endif