Ticket #3161: no_letterbox_in_guide.patch

libs/libmythtv/guidegrid.h

@@ -165 +165 @@
     QDateTime lastTime;
 
     TV *m_player;
+    int playerLetterbox;
 
     QString channelOrdering;
     QString dateformat;

libs/libmythtv/tv_play.h

@@ -188 +188 @@
 
     void SetIgnoreKeys(bool ignore) { ignoreKeys = ignore; }
 
+    void ToggleLetterbox(int letterboxMode = -1);
+    void ToggleLetterbox(int letterboxMode, bool silent);
+    int GetLetterbox(void);
+
   public slots:
     void HandleOSDClosed(int osdType);
 
@@ -233 +237 @@
 
     void ChangeVolume(bool up);
     void ToggleMute(void);
-    void ToggleLetterbox(int letterboxMode = -1);
 
     bool FillMenuTracks(OSDGenericTree*, uint type);
     void ChangeTrack(uint type, int dir);

libs/libmythtv/guidegrid.cpp

@@ -552 +552 @@
     {
         if (m_player->IsRunning() == true && videoRect.width() > 0 &&
             videoRect.height() > 0)
+        {
             m_player->EmbedOutput(this->winId(), videoRect.x(), videoRect.y(),
                                   videoRect.width(), videoRect.height());
+            playerLetterbox = m_player->GetLetterbox();
+            m_player->ToggleLetterbox(kLetterbox_Off, true);
+        }
     }
 
     fillProgramInfos();
@@ -1610 +1614 @@
     setFocus();
 
     if (m_player && videoRect.height() > 0 && videoRect.width() > 0)
+    {
         m_player->EmbedOutput(this->winId(), videoRect.x(), videoRect.y(), 
                               videoRect.width(), videoRect.height());
+        playerLetterbox = m_player->GetLetterbox();
+        m_player->ToggleLetterbox(kLetterbox_Off, true);
+    }
 }
 
 void GuideGrid::enter()
@@ -1620 +1628 @@
     {
         timeCheck->stop();
         if (m_player)
+        {
             m_player->StopEmbeddingOutput();
+            m_player->ToggleLetterbox(playerLetterbox, true);
+        }
     }
 
     unsetCursor();
@@ -1634 +1645 @@
     {
         timeCheck->stop();
         if (m_player)
+        {
             m_player->StopEmbeddingOutput();
+            m_player->ToggleLetterbox(playerLetterbox, true);
+        }
     }
 
     unsetCursor();

libs/libmythtv/tv_play.cpp

@@ -5485 +5485 @@
 
 void TV::ToggleLetterbox(int letterboxMode)
 {
+    ToggleLetterbox(letterboxMode, false);
+}
+
+void TV::ToggleLetterbox(int letterboxMode, bool silent)
+{
     nvp->ToggleLetterbox(letterboxMode);
     int letterbox = nvp->GetLetterbox();
     QString text;
@@ -5500 +5505 @@
         default:                      text = tr("Off"); break;
     }
 
-    if (GetOSD() && !browsemode && !GetOSD()->IsRunningTreeMenu())
+    if (GetOSD() && !browsemode && !GetOSD()->IsRunningTreeMenu() && !silent)
         GetOSD()->SetSettingsText(text, 3);
 }
 
+int TV::GetLetterbox(void)
+{
+    if (nvp)
+        return nvp->GetLetterbox();
+    return false;
+}
+
 void TV::EPGChannelUpdate(uint chanid, QString channum)
 {
     if (chanid && !channum.isEmpty())