diff gui/ui/actions.c @ 35430:2d55540614a9

Move uiProcessNextInPlaylist to the guiInfo structure. It's an information for GUI control and need not be a separate global variable. Additionally, rename it PlaylistNext to shorten the name.
author ib
date Fri, 30 Nov 2012 11:40:35 +0000
parents 3a9048421524
children 20c90da2ba0d
line wrap: on
line diff
--- a/gui/ui/actions.c	Fri Nov 30 11:14:30 2012 +0000
+++ b/gui/ui/actions.c	Fri Nov 30 11:40:35 2012 +0000
@@ -39,8 +39,6 @@
 #include "libvo/video_out.h"
 #include "mp_core.h"
 
-int uiProcessNextInPlaylist = 1;
-
 void uiFullScreen(void)
 {
     if (!guiInfo.VideoWindow)
@@ -255,7 +253,7 @@
 
         if (curr) {
             uiSetFileName(curr->path, curr->name, STREAMTYPE_FILE);
-            uiProcessNextInPlaylist = 0;
+            guiInfo.PlaylistNext = 0;
             break;
         }
 
@@ -312,7 +310,7 @@
 
         if (prev) {
             uiSetFileName(prev->path, prev->name, STREAMTYPE_FILE);
-            uiProcessNextInPlaylist = (guiInfo.Playing ? 0 : 1);
+            guiInfo.PlaylistNext = (guiInfo.Playing ? 0 : 1);
             guiInfo.Track--;
             break;
         }
@@ -365,7 +363,7 @@
 
         if (next) {
             uiSetFileName(next->path, next->name, STREAMTYPE_FILE);
-            uiProcessNextInPlaylist = (guiInfo.Playing ? 0 : 1);
+            guiInfo.PlaylistNext = (guiInfo.Playing ? 0 : 1);
             guiInfo.Track++;
             break;
         }