Ticket #3986: guide-deinterlace.patch

libs/libmythtv/guidegrid.cpp

@@ -740 +740 @@
             type->SetText(curTime);
     }
 
+
     if (m_player)
     {
         if (m_player->IsRunning() == true && videoRect.width() > 0 &&
-            videoRect.height() > 0)
+            videoRect.height() > 0 && m_player->IsEmbedding() == false) {
             m_player->EmbedOutput(this->winId(), videoRect.x(), videoRect.y(),
                                   videoRect.width(), videoRect.height());
+        }
     }
 
     fillProgramInfos();

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -911 +911 @@
     m_scan_locked  = false;
 }
 
+FrameScanType NuppelVideoPlayer::GetScanType() {
+    return m_scan;
+}
+
 void NuppelVideoPlayer::SetScanType(FrameScanType scan)
 {
     QMutexLocker locker(&videofiltersLock);

libs/libmythtv/NuppelVideoPlayer.h

@@ -164 +164 @@
 
     void NextScanType(void)
         { SetScanType((FrameScanType)(((int)m_scan + 1) & 0x3)); }
+    FrameScanType GetScanType();
     void SetScanType(FrameScanType);
     FrameScanType GetScanType(void) const { return m_scan; }
     bool IsScanTypeLocked(void) const { return m_scan_locked; }

libs/libmythtv/tv_play.cpp

@@ -5749 +5749 @@
     embedWinID = wid;
     embedBounds = QRect(x,y,w,h);
 
-    if (nvp)
+    if (nvp) {
+        m_current_scan = nvp->GetScanType();
+        nvp->SetScanType((FrameScanType) 3);
         nvp->EmbedInWidget(wid, x, y, w, h);
+    }
 }
 
 void TV::StopEmbeddingOutput(void)
 {
-    if (nvp)
+    if (nvp) {
         nvp->StopEmbedding();
+        nvp->SetScanType(m_current_scan);
+    }
     embedWinID = 0;
 }
 

libs/libmythtv/tv_play.h

@@ -436 +437 @@
     QString db_channel_format;
     QString db_time_format;
     QString db_short_date_format;
+    FrameScanType m_current_scan;
     int     fftime;
     int     rewtime;
     int     jumptime;