diff gui/win32/interface.c @ 33890:c51e44dd38e2

Remove needless guiInfo member DiskChanged. Use existing member NewPlay for this, because DiskChanged means NewPlay but with the same file. The #ifdef CONFIG_DVDREAD has been removed, because this affects CONFIG_VCD as well and NewPlay is always available.

--- a/gui/win32/interface.c	Fri Aug 12 10:23:25 2011 +0000
+++ b/gui/win32/interface.c	Fri Aug 12 13:14:13 2011 +0000
@@ -117,7 +117,7 @@
             guiInfo.Track = dvd_title;
             guiInfo.Chapter = dvd_chapter;
             guiInfo.Angle = dvd_angle;
-            guiInfo.DiskChanged = 1;
+            guiInfo.NewPlay = GUI_FILE_SAME;
 
             uiSetFileName(NULL, dvd_device, STREAMTYPE_DVD);
             dvdname[0] = 0;
@@ -235,14 +235,15 @@
 #ifdef CONFIG_DVDREAD
                 case STREAMTYPE_DVD:
                 {
-                    guiInfo.DiskChanged = 1;
+                    guiInfo.NewPlay = GUI_FILE_SAME;
                     gui(GUI_SET_STATE, (void *) GUI_PLAY);
                     break;
                 }
 #endif
                 default:
                 {
-                    guiInfo.FilenameChanged = guiInfo.NewPlay = 1;
+                    guiInfo.FilenameChanged = 1;
+                    guiInfo.NewPlay = GUI_FILE_NEW;
                     update_playlistwindow();
                     uiGotoTheNext = guiInfo.Playing? 0 : 1;
                     gui(GUI_SET_STATE, (void *) GUI_STOP);
@@ -271,7 +272,7 @@
        uiPause();
        return;
    }
-   guiInfo.NewPlay = 1;
+   guiInfo.NewPlay = GUI_FILE_NEW;
    gui(GUI_SET_STATE, (void *) GUI_PLAY);
 }
 
@@ -447,7 +448,6 @@
         case GUI_PREPARE:
         {
             gui(GUI_SET_FILE, 0);
-            guiInfo.DiskChanged = 0;
             guiInfo.FilenameChanged = 0;
             guiInfo.NewPlay = 0;
             switch(guiInfo.StreamType)
@@ -657,12 +657,13 @@
               if(movie_aspect >= 0)
                   movie_aspect = -1;
 
-              uiGotoTheNext = guiInfo.FilenameChanged = guiInfo.NewPlay = 1;
+              uiGotoTheNext = guiInfo.FilenameChanged = 1;
+              guiInfo.NewPlay = GUI_FILE_NEW;
               uiSetFileName(NULL, mygui->playlist->tracks[(mygui->playlist->current)++]->filename, STREAMTYPE_STREAM);
               //sprintf(guiInfo.Filename, mygui->playlist->tracks[(mygui->playlist->current)++]->filename);
           }
 
-          if(guiInfo.FilenameChanged && guiInfo.NewPlay)
+          if(guiInfo.FilenameChanged && (guiInfo.NewPlay == GUI_FILE_NEW))
               break;
 
           guiInfo.TimeSec = 0;