[MPlayer-cvslog] r35468 - in trunk/gui: interface.c ui/actions.c ui/actions.h win32/interface.c

[ib]

Author: ib
Date: Sat Nov 24 16:54:22 2012
New Revision: 35468

Log:
Rename uiGotoTheNext uiProcessNextInPlaylist.

This is a more descriptive (although very long) name for the variable.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/actions.h
   trunk/gui/win32/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Nov 23 22:47:31 2012	(r35467)
+++ trunk/gui/interface.c	Sat Nov 24 16:54:22 2012	(r35468)
@@ -765,8 +765,8 @@ int gui(int what, void *data)
 
         uiEventHandling(ivRedraw, 1);
 
-        if (!uiGotoTheNext && guiInfo.Playing) {
-            uiGotoTheNext = 1;
+        if (!uiProcessNextInPlaylist && guiInfo.Playing) {
+            uiProcessNextInPlaylist = 1;
             break;
         }
 
@@ -886,7 +886,7 @@ int guiPlaylistInitialize(play_tree_t *m
     }
 
     uiCurr();   // update filename
-    uiGotoTheNext = 1;
+    uiProcessNextInPlaylist = 1;
 
     if (enqueue)
         filename = NULL;            // don't start playing

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Nov 23 22:47:31 2012	(r35467)
+++ trunk/gui/ui/actions.c	Sat Nov 24 16:54:22 2012	(r35468)
@@ -38,7 +38,7 @@
 #include "libvo/video_out.h"
 #include "mp_core.h"
 
-int uiGotoTheNext = 1;
+int uiProcessNextInPlaylist = 1;
 
 void uiFullScreen(void)
 {
@@ -257,7 +257,7 @@ void uiCurr(void)
 
         if (curr) {
             uiSetFileName(curr->path, curr->name, STREAMTYPE_FILE);
-            uiGotoTheNext = 0;
+            uiProcessNextInPlaylist = 0;
             break;
         }
 
@@ -310,7 +310,7 @@ void uiPrev(void)
 
         if (prev) {
             uiSetFileName(prev->path, prev->name, STREAMTYPE_FILE);
-            uiGotoTheNext = (guiInfo.Playing ? 0 : 1);
+            uiProcessNextInPlaylist = (guiInfo.Playing ? 0 : 1);
             guiInfo.Track--;
             break;
         }
@@ -371,7 +371,7 @@ void uiNext(void)
 
         if (next) {
             uiSetFileName(next->path, next->name, STREAMTYPE_FILE);
-            uiGotoTheNext = (guiInfo.Playing ? 0 : 1);
+            uiProcessNextInPlaylist = (guiInfo.Playing ? 0 : 1);
             guiInfo.Track++;
             break;
         }

Modified: trunk/gui/ui/actions.h
==============================================================================
--- trunk/gui/ui/actions.h	Fri Nov 23 22:47:31 2012	(r35467)
+++ trunk/gui/ui/actions.h	Sat Nov 24 16:54:22 2012	(r35468)
@@ -23,7 +23,7 @@
 
 #define SAME_STREAMTYPE (STREAMTYPE_DUMMY - 1)
 
-extern int uiGotoTheNext;
+extern int uiProcessNextInPlaylist;
 
 void uiAbsSeek(float sec);
 void uiChangeSkin(char *name);

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Fri Nov 23 22:47:31 2012	(r35467)
+++ trunk/gui/win32/interface.c	Sat Nov 24 16:54:22 2012	(r35468)
@@ -77,7 +77,7 @@ int guiWinID = 0;
 
 char *skinName = NULL;
 char *codecname = NULL;
-int uiGotoTheNext = 1;
+int uiProcessNextInPlaylist = 1;
 static gui_t *mygui = NULL;
 static int update_videowindow(void);
 static RECT old_rect;
@@ -364,7 +364,7 @@ static void guiSetEvent(int event)
                 {
                     guiInfo.NewPlay = GUI_FILE_NEW;
                     update_playlistwindow();
-                    uiGotoTheNext = guiInfo.Playing? 0 : 1;
+                    uiProcessNextInPlaylist = guiInfo.Playing? 0 : 1;
                     gui(GUI_SET_STATE, (void *) GUI_STOP);
                     gui(GUI_SET_STATE, (void *) GUI_PLAY);
                     break;
@@ -766,13 +766,13 @@ int gui(int what, void *data)
         {
           guiInfo.sh_video = NULL;
 
-          if(!uiGotoTheNext && guiInfo.Playing)
+          if(!uiProcessNextInPlaylist && guiInfo.Playing)
           {
-              uiGotoTheNext = 1;
+              uiProcessNextInPlaylist = 1;
               break;
           }
 
-          if(uiGotoTheNext && guiInfo.Playing &&
+          if(uiProcessNextInPlaylist && guiInfo.Playing &&
             (mygui->playlist->current < (mygui->playlist->trackcount - 1)) &&
             guiInfo.StreamType != STREAMTYPE_DVD &&
             guiInfo.StreamType != STREAMTYPE_DVDNAV)
@@ -781,7 +781,7 @@ int gui(int what, void *data)
               if(movie_aspect >= 0)
                   movie_aspect = -1;
 
-              uiGotoTheNext = 1;
+              uiProcessNextInPlaylist = 1;
               guiInfo.NewPlay = GUI_FILE_NEW;
               uiSetFileName(NULL, mygui->playlist->tracks[(mygui->playlist->current)++]->filename, STREAMTYPE_FILE);
               //sprintf(guiInfo.Filename, mygui->playlist->tracks[(mygui->playlist->current)++]->filename);
@@ -864,7 +864,7 @@ int guiPlaylistInitialize(play_tree_t *m
                 result = 1;
         }
     }
-    uiGotoTheNext = 1;
+    uiProcessNextInPlaylist = 1;
 
     if (result)
     {