[MPlayer-cvslog] r35519 - trunk/gui/ui/actions.c

[ib]

Author: ib
Date: Fri Nov 30 10:42:23 2012
New Revision: 35519

Log:
Don't treat STREAMTYPE_VCD differently in uiNext().

There is no difference in selecting the next track
between a CD and VCD, so remove the extra code for VCD.

Modified:
   trunk/gui/ui/actions.c

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Thu Nov 29 18:57:38 2012	(r35518)
+++ trunk/gui/ui/actions.c	Fri Nov 30 10:42:23 2012	(r35519)
@@ -332,6 +332,7 @@ void uiNext(void)
 
     switch (guiInfo.StreamType) {
     case STREAMTYPE_CDDA:
+    case STREAMTYPE_VCD:
 
         if (++guiInfo.Track > guiInfo.Tracks) {
             guiInfo.Track = guiInfo.Tracks;
@@ -340,15 +341,6 @@ void uiNext(void)
 
         break;
 
-    case STREAMTYPE_VCD:
-
-        if (++guiInfo.Track >= guiInfo.Tracks) {
-            stop = (guiInfo.Track > guiInfo.Tracks);
-            guiInfo.Track = FFMAX(2, guiInfo.Tracks);
-        }
-
-        break;
-
     case STREAMTYPE_DVD:
 
         if (guiInfo.Chapter++ == guiInfo.Chapters) {