[MPlayer-cvslog] r35653 - trunk/gui/interface.c

[ib]

Author: ib
Date: Mon Dec 10 13:49:40 2012
New Revision: 35653

Log:
Relocate code to set Track, Chapter and Angle start values.

Because we're handling playlist playback (isPlaylistStreamtype)
since r35512 separately now, it's clearer that way.

Modified:
   trunk/gui/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Dec 10 13:46:56 2012	(r35652)
+++ trunk/gui/interface.c	Mon Dec 10 13:49:40 2012	(r35653)
@@ -835,13 +835,6 @@ int gui(int what, void *data)
 
             filename = NULL;
 
-            guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1);
-
-            if (guiInfo.Chapter)
-                guiInfo.Chapter = 1;
-            if (guiInfo.Angle)
-                guiInfo.Angle = 1;
-
             if (isPlaylistStreamtype) {
                 plItem *curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
 
@@ -852,6 +845,13 @@ int gui(int what, void *data)
                     uiSetFile(curr->path, curr->name, STREAMTYPE_FILE);
                     guiInfo.Track = 1;
                 }
+            } else if (guiInfo.Playing) {
+                guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1);
+
+                if (guiInfo.Chapter)
+                    guiInfo.Chapter = 1;
+                if (guiInfo.Angle)
+                    guiInfo.Angle = 1;
             }
 
             guiInfo.ElapsedTime = 0;