Ticket #1959: dvd_changetrack.diff

libs/libmythtv/DVDRingBuffer.cpp

@@ -963 +963 @@
     return dvdfps;
 }
 
+bool DVDRingBufferPriv::IsSameChapter(int tmpcellid, int tmpvobid)
+{
+    if ((tmpcellid == cellid) && (tmpvobid == vobid))
+        return true;
+
+    return false;
+}
+
 /** \fn DVDRingBufferPriv::guess_palette(uint32_t, uint8_t, uint8_t)
  * \brief converts palette values from YUV to RGB
  */

libs/libmythtv/DVDRingBuffer.h

@@ -60 +60 @@
 
     bool JumpToTitle(void) { return jumptotitle; }
     double GetFrameRate(void);
+    int GetCellID(void) { return cellid; }
+    int GetVobID(void)  { return vobid; }
+    bool IsSameChapter(int tmpcellid, int tmpvobid);
     
     // commands
     bool OpenFile(const QString &filename);

libs/libmythtv/decoderbase.cpp

@@ -689 +689 @@
 
 void DecoderBase::ChangeDVDTrack(bool ffw)
 {
-    bool result = true;
     if (!ringBuffer->isDVD())
         return;
+    
+    bool result = true;
+    int prevcellstart = ringBuffer->DVD()->GetCellStart();
+    int prevcellid = ringBuffer->DVD()->GetCellID();
+    int prevvobid  = ringBuffer->DVD()->GetVobID();
 
-    uint prevcellstart = ringBuffer->DVD()->GetCellStart();
-
     if (ffw)
         result = ringBuffer->DVD()->nextTrack();
     else
@@ -704 +706 @@
     {
         if ((prevcellstart == 0 && ffw) || (prevcellstart != 0))
         {
-            while (prevcellstart == ringBuffer->DVD()->GetCellStart())
+            int limit = 0;
+            while (ringBuffer->DVD()->IsSameChapter(prevcellid, prevvobid)
+                    && limit < 50)
+            {
+                limt++;
                 usleep(10000);
+            }
         } 
 
         uint elapsed = ringBuffer->DVD()->GetCellStart();