Ticket #3019: continue_play_while_in_program_guide.diff

libs/libmythtv/guidegrid.cpp

@@ -33 +33 @@
 #include "remoteutil.h"
 #include "channelutil.h"
 
+QWaitCondition ggIsVisibleCond;
+
 bool RunProgramGuide(uint &chanid, QString &channum,
                      bool thread, TV *player,
                      bool allowsecondaryepg)
@@ -53 +55 @@
     if (thread)
     {
         qApp->unlock();
-
-        while (gg->isVisible())
-            usleep(50);
+        ggIsVisibleCond.wait(); 
     }
     else
         gg->exec();
@@ -292 +297 @@
     m_channelInfos.clear();
 
     delete theme;
+
+    if (timeCheck)
+    {
+        timeCheck->disconnect(this);
+        timeCheck->deleteLater();
+        timeCheck = NULL;
+    }
+
+    if (jumpToChannelTimer)
+    {
+        jumpToChannelTimer->disconnect(this);
+        jumpToChannelTimer->deleteLater();
+        jumpToChannelTimer = NULL;
+    }
 }
 
 void GuideGrid::keyPressEvent(QKeyEvent *e)
@@ -1635 +1654 @@
     }
 
     unsetCursor();
+    ggIsVisibleCond.wakeAll();
     accept();
 }
 

libs/libmythtv/tv_play.cpp

@@ -4996 +5062 @@
     bool changeChannel = false;
     ProgramInfo *nextProgram = NULL;
 
+    // See if we can provide a channel preview in EPG
+    bool allowsecondary = true;
+    if (nvp && nvp->getVideoOutput())
+        allowsecondary = nvp->getVideoOutput()->AllowPreviewEPG();
+      
     if (StateIsLiveTV(GetState()))
     {
         switch (editType)
@@ -5003 +5074 @@
             default:
             case kScheduleProgramGuide:
             {
-                // See if we can provide a channel preview in EPG
-                bool allowsecondary = true;
-                if (nvp && nvp->getVideoOutput())
-                    allowsecondary = nvp->getVideoOutput()->AllowPreviewEPG();
-
                 // Start up EPG
                 changeChannel = RunProgramGuide(chanid, channum, true, this, allowsecondary);
                 break;
@@ -5047 +5113 @@
         if (!paused)
             DoPause(false);
 
+        long long margin =
+            (long long)(nvp->GetFrameRate() * nvp->GetAudioStretchFactor());
+
         switch (editType)
         {
             default:
             case kScheduleProgramGuide:
-                RunProgramGuide(chanid, channum, true);
+            {
+                if (!stayPaused && paused && !isnearend)
+                {
+                    DoPause(false);
+                    stayPaused = true;
+                }
+                RunProgramGuide(chanid, channum, true, this, allowsecondary);
                 break;
+            }
             case kScheduleProgramFinder:
                 RunProgramFind(true, false);
                 break;
@@ -5067 +5143 @@
             }
             case kPlaybackBox:
             {
-                long long margin = 
-                    (long long)(nvp->GetFrameRate() * nvp->GetAudioStretchFactor());
                 // keep video paused if only 5 seconds left in recording
                 margin = margin * 5; 
                 QDomElement pbbxmldata;