# HG changeset patch
# User ib
# Date 1395414757 0
# Node ID ad939f49bb28bc7b277ff66a4299a16a36a5e2ef
# Parent  9afababf229e3e11ddfc9ee6abd86565b4b9e6a5
Cosmetic: Rename guiInfo member NewPlay MediumChanged.

diff -r 9afababf229e -r ad939f49bb28 gui/dialog/fileselect.c
--- a/gui/dialog/fileselect.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/dialog/fileselect.c	Fri Mar 21 15:12:37 2014 +0000
@@ -478,7 +478,7 @@
             g_free(selected);
         }
 
-        guiInfo.NewPlay = GUI_MEDIUM_NEW;
+        guiInfo.MediumChanged = GUI_MEDIUM_NEW;
         sub_fps = 0;
         fs_PersistantHistory(fsSelectedDirectory);
         break;
diff -r 9afababf229e -r ad939f49bb28 gui/dialog/playlist.c
--- a/gui/dialog/playlist.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/dialog/playlist.c	Fri Mar 21 15:12:37 2014 +0000
@@ -166,7 +166,7 @@
 	  if ( item )
 	   {
 	    uiSetFile( item->path,item->name,STREAMTYPE_FILE );
-	    guiInfo.NewPlay = GUI_MEDIUM_NEW;
+	    guiInfo.MediumChanged = GUI_MEDIUM_NEW;
 	    guiInfo.PlaylistNext = !guiInfo.Playing;
 	    guiInfo.Track = 1;
 	   }
diff -r 9afababf229e -r ad939f49bb28 gui/dialog/url.c
--- a/gui/dialog/url.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/dialog/url.c	Fri Mar 21 15:12:37 2014 +0000
@@ -81,7 +81,7 @@
                     listMgr(URLLIST_ITEM_ADD, item);
                 }
 
-                guiInfo.NewPlay = GUI_MEDIUM_NEW;
+                guiInfo.MediumChanged = GUI_MEDIUM_NEW;
                 uiEvent(evPlay, 0);
             }
         }
diff -r 9afababf229e -r ad939f49bb28 gui/interface.c
--- a/gui/interface.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/interface.c	Fri Mar 21 15:12:37 2014 +0000
@@ -404,7 +404,7 @@
         usec_sleep(20000);
         wsEvents();
 
-        if (guiInfo.NewPlay == GUI_MEDIUM_NEW) {
+        if (guiInfo.MediumChanged == GUI_MEDIUM_NEW) {
             audio_id  = -1;
             video_id  = -1;
             dvdsub_id = -1;
@@ -593,12 +593,12 @@
 
         if (guiInfo.AudioFilename)
             audio_stream = gstrdup(guiInfo.AudioFilename);
-        else if (guiInfo.NewPlay == GUI_MEDIUM_NEW)
+        else if (guiInfo.MediumChanged == GUI_MEDIUM_NEW)
             nfree(audio_stream);
 
 // audio_stream = NULL;
 
-        guiInfo.NewPlay = 0;
+        guiInfo.MediumChanged = 0;
 
         ass_enabled       = gtkASS.enabled;
         ass_use_margins   = gtkASS.use_margins;
@@ -807,10 +807,10 @@
 
         if (next) {
             uiSetFile(next->path, next->name, STREAMTYPE_FILE);
-            guiInfo.NewPlay = GUI_MEDIUM_NEW;
+            guiInfo.MediumChanged = GUI_MEDIUM_NEW;
             guiInfo.Track   = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next);
         } else {
-            if (guiInfo.NewPlay == GUI_MEDIUM_NEW)
+            if (guiInfo.MediumChanged == GUI_MEDIUM_NEW)
                 break;
 
             filename = NULL;
diff -r 9afababf229e -r ad939f49bb28 gui/interface.h
--- a/gui/interface.h	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/interface.h	Fri Mar 21 15:12:37 2014 +0000
@@ -68,7 +68,7 @@
 //@}
 
 //@{
-/// NewPlay reason
+/// MediumChanged reason
 #define GUI_MEDIUM_SAME 1
 #define GUI_MEDIUM_NEW  2
 //@}
@@ -134,7 +134,7 @@
     float Volume;
     float Balance;
 
-    int NewPlay;              // public, read access by MPlayer
+    int MediumChanged;        // public, read access by MPlayer
     int PlaylistNext;
 } guiInterface_t;
 
diff -r 9afababf229e -r ad939f49bb28 gui/ui/actions.c
--- a/gui/ui/actions.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/ui/actions.c	Fri Mar 21 15:12:37 2014 +0000
@@ -199,7 +199,7 @@
                 if (!guiInfo.Track)
                     guiInfo.Track = 1;
 
-                guiInfo.NewPlay      = GUI_MEDIUM_NEW;
+                guiInfo.MediumChanged = GUI_MEDIUM_NEW;
                 guiInfo.PlaylistNext = !guiInfo.Playing;
 
                 break;
@@ -213,7 +213,7 @@
                 if (!guiInfo.Track)
                     guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1);
 
-                guiInfo.NewPlay = GUI_MEDIUM_SAME;
+                guiInfo.MediumChanged = GUI_MEDIUM_SAME;
 
                 break;
             }
diff -r 9afababf229e -r ad939f49bb28 gui/win32/interface.c
--- a/gui/win32/interface.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/gui/win32/interface.c	Fri Mar 21 15:12:37 2014 +0000
@@ -212,7 +212,7 @@
             guiInfo.Track = 1;
             guiInfo.Chapter = 1;
             guiInfo.Angle = 1;
-            guiInfo.NewPlay = GUI_MEDIUM_SAME;
+            guiInfo.MediumChanged = GUI_MEDIUM_SAME;
 
 #ifdef __WINE__
             // dvd_device is in the Windows style (D:\), which needs to be
@@ -356,13 +356,13 @@
             {
                 case STREAMTYPE_DVD:
                 {
-                    guiInfo.NewPlay = GUI_MEDIUM_SAME;
+                    guiInfo.MediumChanged = GUI_MEDIUM_SAME;
                     gui(GUI_SET_STATE, (void *) GUI_PLAY);
                     break;
                 }
                 default:
                 {
-                    guiInfo.NewPlay = GUI_MEDIUM_NEW;
+                    guiInfo.MediumChanged = GUI_MEDIUM_NEW;
                     update_playlistwindow();
                     guiInfo.PlaylistNext = guiInfo.Playing? 0 : 1;
                     gui(GUI_SET_STATE, (void *) GUI_STOP);
@@ -391,7 +391,7 @@
        uiPause();
        return;
    }
-   guiInfo.NewPlay = GUI_MEDIUM_NEW;
+   guiInfo.MediumChanged = GUI_MEDIUM_NEW;
    gui(GUI_SET_STATE, (void *) GUI_PLAY);
 }
 
@@ -616,7 +616,7 @@
             }
             if(gtkCacheOn) stream_cache_size = gtkCacheSize;
             if(gtkAutoSyncOn) autosync = gtkAutoSync;
-            guiInfo.NewPlay = 0;
+            guiInfo.MediumChanged = 0;
             break;
         }
         case GUI_SET_AUDIO:
@@ -779,12 +779,12 @@
                   movie_aspect = -1;
 
               guiInfo.PlaylistNext = TRUE;
-              guiInfo.NewPlay = GUI_MEDIUM_NEW;
+              guiInfo.MediumChanged = GUI_MEDIUM_NEW;
               uiSetFile(NULL, mygui->playlist->tracks[(mygui->playlist->current)++]->filename, STREAMTYPE_FILE);
               //sprintf(guiInfo.Filename, mygui->playlist->tracks[(mygui->playlist->current)++]->filename);
           }
 
-          if(guiInfo.NewPlay == GUI_MEDIUM_NEW)
+          if(guiInfo.MediumChanged == GUI_MEDIUM_NEW)
               break;
 
           guiInfo.ElapsedTime = 0;
diff -r 9afababf229e -r ad939f49bb28 mplayer.c
--- a/mplayer.c	Fri Mar 21 15:01:48 2014 +0000
+++ b/mplayer.c	Fri Mar 21 15:12:37 2014 +0000
@@ -4041,7 +4041,7 @@
                     break;                  // STOP
                 if (guiInfo.Playing == GUI_PAUSE)
                     mpctx->osd_function = OSD_PAUSE;
-                if (guiInfo.NewPlay)
+                if (guiInfo.MediumChanged)
                     goto goto_next_file;
 #ifdef CONFIG_DVDREAD
                 if (mpctx->stream->type == STREAMTYPE_DVD) {
@@ -4139,7 +4139,7 @@
 
 #ifdef CONFIG_GUI
     if (use_gui)
-        if (guiInfo.NewPlay != GUI_MEDIUM_SAME)
+        if (guiInfo.MediumChanged != GUI_MEDIUM_SAME)
             gui(GUI_END_FILE, 0);
 #endif