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

[ib]

Author: ib
Date: Thu Apr 26 05:38:52 2018
New Revision: 38102

Log:
Reset track on CD, VCD or DVD playback change.

The track may already be set by the (current) playback
of an other stream type, so reset it when starting a CD,
VCD or DVD playback.

Modified:
   trunk/gui/ui/actions.c

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Wed Apr 18 00:39:31 2018	(r38101)
+++ trunk/gui/ui/actions.c	Thu Apr 26 05:38:52 2018	(r38102)
@@ -134,6 +134,8 @@ void uiEvent(int ev, float param)
         guiInfo.Track = iparam;
 
     case evPlayCD:
+        if (guiInfo.StreamType != STREAMTYPE_CDDA)
+            guiInfo.Track = 0;
         guiInfo.StreamType = STREAMTYPE_CDDA;
         goto play;
 #endif
@@ -142,6 +144,8 @@ void uiEvent(int ev, float param)
         guiInfo.Track = iparam;
 
     case evPlayVCD:
+        if (guiInfo.StreamType != STREAMTYPE_VCD)
+            guiInfo.Track = 0;
         guiInfo.StreamType = STREAMTYPE_VCD;
         goto play;
 #endif
@@ -171,6 +175,8 @@ void uiEvent(int ev, float param)
     case evPlayDVD:
         guiInfo.Chapter = 1;
         guiInfo.Angle   = 1;
+        if (guiInfo.StreamType != STREAMTYPE_DVD)
+            guiInfo.Track = 0;
 
     case ivPlayDVD:
         guiInfo.StreamType = STREAMTYPE_DVD;