Ticket #1752: jump_ffw_rew_in_dvd.patch

libs/libmythtv/tv_play.cpp

@@ -2409 +2409 @@
                 if (prbuffer->InDVDMenuOrStillFrame())
                     UpdateOSDSeekMessage(tr("Skip Back Not Allowed"),
                                          osd_general_timeout);
-                else if (prbuffer->DVD()->NumPartsInTitle() < 2)
+                else if (prbuffer->DVD()->NumPartsInTitle() > 2)
                 {
-                    nvp->GoToDVDProgram(0);
-                    UpdateOSDSeekMessage(tr("Previous Title"),
-                            osd_general_timeout);
+                    nvp->ChangeDVDTrack(0);
+                    UpdateOSDSeekMessage(tr("Previous Chapter"),
+                                            osd_general_timeout);
                 }
                 else
                 {
-                    nvp->ChangeDVDTrack(0);
-                    UpdateOSDSeekMessage(tr("Previous Chapter"),
-                            osd_general_timeout);
+                    uint titleLength = prbuffer->DVD()->GetTotalTimeOfTitle();
+                    uint chapterLength = prbuffer->DVD()->GetChapterLength();
+                    if ((titleLength == chapterLength) &&
+                        chapterLength > 300)
+                    {
+                        DoSeek(-jumptime * 60, tr("Jump Back"));
+                    } 
+                    else
+                    {                        
+                        nvp->GoToDVDProgram(0);
+                        UpdateOSDSeekMessage(tr("Previous Title"),
+                                                osd_general_timeout);
+                    }
                 }
             }
             else
@@ -2443 +2453 @@
                     UpdateOSDSeekMessage(tr("Next Chapter"),
                             osd_general_timeout);
                 }
-                else 
+                else
                 {
-                    nvp->GoToDVDProgram(1);
-                    UpdateOSDSeekMessage(tr("Next Title"), 
+                    uint titleLength = prbuffer->DVD()->GetTotalTimeOfTitle();
+                    uint chapterLength = prbuffer->DVD()->GetChapterLength();
+                    uint currentTime = prbuffer->DVD()->GetCurrentTime();
+                    if ((titleLength == chapterLength) &&
+                        (currentTime < (chapterLength - (jumptime * 60))) &&
+                        chapterLength > 300)
+                    {
+                        DoSeek(jumptime * 60, tr("Jump Ahead"));
+                    }
+                    else
+                    {
+                        nvp->GoToDVDProgram(1);
+                        UpdateOSDSeekMessage(tr("Next Title"), 
                             osd_general_timeout);
+                    }
                 }
             }
             else