Ticket #146: jumpprev.diff

libs/libmythtv/tv_play.cpp

@@ -130 +130 @@
     REG_KEY("TV Playback", "NEXTAUDIO", "Switch to the next audio track", "+");
     REG_KEY("TV Playback", "PREVAUDIO", "Switch to the previous audio track", "-");
     REG_KEY("TV Playback", "SUBCHANNELSEP", "Separator for HDTV subchannels", "_");
+    REG_KEY("TV Playback", "JUMPPREV", "Jump to previously played recording", "");
     
     REG_KEY("TV Editing", "CLEARMAP", "Clear editing cut points", "C,Q,Home");
     REG_KEY("TV Editing", "INVERTMAP", "Invert Begin/End cut points", "I");
@@ -504 +505 @@
 
 }
 
+void TV::setLastProgram(ProgramInfo *rcinfo)
+{
+    lastProgram = rcinfo;
+}
+
 int TV::Playback(ProgramInfo *rcinfo)
 {
+    jumpToProgram = false;
+
     if (internalState != kState_None)
         return 0;
 
@@ -1852 +1860 @@
         {
             ClearOSD();
         }
+        else if (action == "JUMPPREV")
+        {
+            nvp->SetBookmark();
+            exitPlayer = true;
+            wantsToQuit = true;
+            jumpToProgram = true;
+        }
         else if (action == "ESCAPE")
         {
             if (GetOSD() && ClearOSD())
@@ -4230 +4245 @@
             SetAutoCommercialSkip(action.right(1).toInt());
         else if (action == "QUEUETRANSCODE")
             DoQueueTranscode();
+        else if (action == "JUMPPREV")
+        {
+            nvp->SetBookmark();
+            exitPlayer = true;
+            wantsToQuit = true;
+            jumpToProgram = true;
+        }
         else
         {
             cout << "unknown menu action selected: " << action << endl;
@@ -4303 +4325 @@
     }
     else if (StateIsPlaying(internalState))
     {
+        if (lastProgram != NULL)
+            item = new OSDGenericTree(treeMenu, tr("Jump to Previous Recording"), "JUMPPREV");
+
         item = new OSDGenericTree(treeMenu, tr("Edit Recording"), "TOGGLEEDIT");
 
         if (JobQueue::IsJobQueuedOrRunning(JOB_TRANSCODE,

libs/libmythtv/tv_play.h

@@ -109 +109 @@
     OSD *GetOSD(void);
 
     bool IsErrored(void) { return errored; }
+
+    void setLastProgram(ProgramInfo *rcinfo);
+    bool getJumpToProgram(void) { return jumpToProgram; }
   public slots:
     void HandleOSDClosed(int osdType);
 
@@ -339 +342 @@
     ProgramInfo *playbackinfo;  ///< info sent in via Playback()
     QString      inputFilename; ///< playbackinfo->pathname
     int          playbackLen;   ///< initial playbackinfo->CalculateLength()
+    ProgramInfo *lastProgram;   ///< last program played with this player
+    bool         jumpToProgram;
 
     // Video Players
     NuppelVideoPlayer *nvp;

programs/mythfrontend/playbackbox.cpp

@@ -125 +125 @@
     popup = NULL;
     curitem = NULL;
     delitem = NULL;
+    lastProgram = NULL;
 
     // titleView controls showing titles in group list 
     titleView = true;
@@ -1786 +1787 @@
     state = kKilling; // stop preview playback and don't restart it
     playingSomething = true;
 
+    tv->setLastProgram(lastProgram);
+
     if (tv->Playback(tvrec))
     {
         while (tv->GetState() != kState_None)
@@ -1795 +1798 @@
             usleep(100000);
             qApp->lock();
         }
+        while (tv->getJumpToProgram())
+        {
+            ProgramInfo *tmpProgram = new ProgramInfo(*lastProgram);
+            lastProgram = new ProgramInfo(*tvrec);
+            tvrec = tmpProgram;
+            if (tv->Playback(tvrec))
+            {
+                while (tv->GetState() != kState_None)
+                {
+                    qApp->unlock();
+                    qApp->processEvents();
+                    usleep(100000);
+                    qApp->lock();
+                }
+            }
+        }
     }
 
+    lastProgram = new ProgramInfo(*rec);
+
     playingSomething = false;
     state = kStarting; // restart playback preview
     setEnabled(true);

programs/mythfrontend/playbackbox.h

@@ -157 +158 @@
     ProgramInfo *curitem;
     ProgramInfo *delitem;
 
+    ProgramInfo *lastProgram;
+
     void LoadWindow(QDomElement &);
     XMLParse *theme;
     QDomElement xmldata;