Cosmetic: Rename guiInfo member NewPlay MediumChanged.
authorib <ib@b3059339-0415-0410-9bf9-f77b7e298cf2>
Fri, 21 Mar 2014 15:12:37 +0000 (15:12 +0000)
committerib <ib@b3059339-0415-0410-9bf9-f77b7e298cf2>
Fri, 21 Mar 2014 15:12:37 +0000 (15:12 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@37033 b3059339-0415-0410-9bf9-f77b7e298cf2

gui/dialog/fileselect.c
gui/dialog/playlist.c
gui/dialog/url.c
gui/interface.c
gui/interface.h
gui/ui/actions.c
gui/win32/interface.c
mplayer.c

index db84f29..8012ccc 100644 (file)
@@ -478,7 +478,7 @@ static void fs_Ok_released(GtkButton *button, gpointer user_data)
             g_free(selected);
         }
 
-        guiInfo.NewPlay = GUI_MEDIUM_NEW;
+        guiInfo.MediumChanged = GUI_MEDIUM_NEW;
         sub_fps = 0;
         fs_PersistantHistory(fsSelectedDirectory);
         break;
index 100af0e..5082907 100644 (file)
@@ -166,7 +166,7 @@ static void plButtonReleased( GtkButton * button,gpointer user_data )
          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;
           }
index 9741b1f..19ffc29 100644 (file)
@@ -81,7 +81,7 @@ static void button_clicked(GtkButton *button, gpointer user_data)
                     listMgr(URLLIST_ITEM_ADD, item);
                 }
 
-                guiInfo.NewPlay = GUI_MEDIUM_NEW;
+                guiInfo.MediumChanged = GUI_MEDIUM_NEW;
                 uiEvent(evPlay, 0);
             }
         }
index 7cbdaae..5eaa6f3 100644 (file)
@@ -404,7 +404,7 @@ int gui(int what, void *data)
         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 @@ int gui(int what, void *data)
 
         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 @@ int gui(int what, void *data)
 
         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;
index f39fce4..f788b48 100644 (file)
@@ -68,7 +68,7 @@ enum {
 //@}
 
 //@{
-/// NewPlay reason
+/// MediumChanged reason
 #define GUI_MEDIUM_SAME 1
 #define GUI_MEDIUM_NEW  2
 //@}
@@ -134,7 +134,7 @@ typedef struct {
     float Volume;
     float Balance;
 
-    int NewPlay;              // public, read access by MPlayer
+    int MediumChanged;        // public, read access by MPlayer
     int PlaylistNext;
 } guiInterface_t;
 
index 6859129..e0b2c42 100644 (file)
@@ -199,7 +199,7 @@ play:
                 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 @@ play:
                 if (!guiInfo.Track)
                     guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1);
 
-                guiInfo.NewPlay = GUI_MEDIUM_SAME;
+                guiInfo.MediumChanged = GUI_MEDIUM_SAME;
 
                 break;
             }
index 67d53bc..47f42a1 100644 (file)
@@ -212,7 +212,7 @@ static void guiSetEvent(int event)
             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 @@ static void guiSetEvent(int event)
             {
                 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 @@ void uiPlay( void )
        uiPause();
        return;
    }
-   guiInfo.NewPlay = GUI_MEDIUM_NEW;
+   guiInfo.MediumChanged = GUI_MEDIUM_NEW;
    gui(GUI_SET_STATE, (void *) GUI_PLAY);
 }
 
@@ -616,7 +616,7 @@ int gui(int what, void *data)
             }
             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 @@ int gui(int what, void *data)
                   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;
index 3b021a0..bdb0613 100644 (file)
--- a/mplayer.c
+++ b/mplayer.c
@@ -4041,7 +4041,7 @@ goto_enable_cache:
                     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 @@ goto_next_file:  // don't jump here after ao/vo/getch initialization!
 
 #ifdef CONFIG_GUI
     if (use_gui)
-        if (guiInfo.NewPlay != GUI_MEDIUM_SAME)
+        if (guiInfo.MediumChanged != GUI_MEDIUM_SAME)
             gui(GUI_END_FILE, 0);
 #endif