[MPlayer-cvslog] r37971 - in trunk/gui: interface.c ui/actions.c

[ib]

Author: ib
Date: Thu Oct  5 14:02:14 2017
New Revision: 37971

Log:
Make position selection during cue sheet playlist playback consistent.

So far, it was possible to move to any previous playback position, but
when selecting a later position playback automatically (and annoyingly)
jumped to the next track.

Make it consistent and allow to directly select any playback position,
and if reaching the end of the last track after such a selection, stop
playback.

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Oct  5 13:17:23 2017	(r37970)
+++ trunk/gui/interface.c	Thu Oct  5 14:02:14 2017	(r37971)
@@ -1020,6 +1020,11 @@ int gui(int what, void *data)
             }
 
             next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0);
+
+            if (guiInfo.Stop && (guiInfo.ElapsedTime > guiInfo.Stop)) {
+                while (next && next->stop)
+                    next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0);
+            }
         }
 
         if (next) {

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Thu Oct  5 13:17:23 2017	(r37970)
+++ trunk/gui/ui/actions.c	Thu Oct  5 14:02:14 2017	(r37971)
@@ -998,7 +998,7 @@ int uiCueCheckNext(int *set)
 {
     plItem *next;
 
-    if (guiInfo.Stop && (guiInfo.ElapsedTime >= guiInfo.Stop)) {
+    if (guiInfo.Stop && (guiInfo.ElapsedTime == guiInfo.Stop)) {
         if (!*set) {
             *set = True;
             return -1;