Mercurial > mplayer.hg

changeset 35559:14e36699a6e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Mon, 10 Dec 2012 12:49:40 +0000
parents 59361080b09e
children 1a2200a93ea8
files gui/interface.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Mon Dec 10 12:46:56 2012 +0000
+++ b/gui/interface.c	Mon Dec 10 12:49:40 2012 +0000
@@ -835,13 +835,6 @@
 
             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 @@
                     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;