TV: Disable tuning OSD after changing channel via NETWORK_CONTROL CHANID

This disables the tuning OSD display when changing channel via a MythEvent.
The intention is to provide a cleaner display for MHEG programs that change
streams. Refs #9867.

Signed-off-by: Paul Harrison <pharrison@mythtv.org>

mythtv/libs/libmythtv/tv_play.cpp

@@ -6766,7 +6766,7 @@ void TV::ChangeChannel(PlayerContext *ctx, uint chanid, const QString &chan)
     if (ctx->player)
         ctx->player->GetAudio()->Reset();
 
-    UnpauseLiveTV(ctx);
+    UnpauseLiveTV(ctx, chanid && GetQueuedChanID());
 
     if (oldinputname != ctx->recorder->GetInput())
         UpdateOSDInput(ctx);
@@ -8403,16 +8403,21 @@ void TV::customEvent(QEvent *e)
         QStringList signalList = me->ExtraDataList();
 
         PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
-        for (uint i = 0; mctx && (i < player.size()); i++)
+        OSD *osd = GetOSDLock(mctx);
+        if (osd && osd->IsWindowVisible("program_info"))
         {
-            PlayerContext *ctx = GetPlayer(mctx, i);
-            bool tc = ctx->recorder && (ctx->GetCardID() == cardnum);
-            if (tc && !signalList.empty())
+            for (uint i = 0; mctx && (i < player.size()); i++)
             {
-                UpdateOSDSignal(ctx, signalList);
-                UpdateOSDTimeoutMessage(ctx);
+                PlayerContext *ctx = GetPlayer(mctx, i);
+                bool tc = ctx->recorder && (ctx->GetCardID() == cardnum);
+                if (tc && !signalList.empty())
+                {
+                    UpdateOSDSignal(ctx, signalList);
+                    UpdateOSDTimeoutMessage(ctx);
+                }
             }
         }
+        ReturnOSDLock(mctx, osd);
         ReturnPlayerLock(mctx);
     }
 
@@ -11280,7 +11285,7 @@ void TV::PauseLiveTV(PlayerContext *ctx)
  *  \brief Used in ChangeChannel(), ChangeChannel(),
  *         and ToggleInputs() to restart video output.
  */
-void TV::UnpauseLiveTV(PlayerContext *ctx)
+void TV::UnpauseLiveTV(PlayerContext *ctx, bool bQuietly /*=false*/)
 {
     LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("UnpauseLiveTV() player ctx %1")
             .arg(find_player_index(ctx)));
@@ -11300,7 +11305,7 @@ void TV::UnpauseLiveTV(PlayerContext *ctx)
 
     ITVRestart(ctx, true);
 
-    if (ctx->HasPlayer())
+    if (ctx->HasPlayer() && !bQuietly)
     {
         UpdateOSDProgInfo(ctx, "program_info");
         UpdateLCD();

mythtv/libs/libmythtv/tv_play.h

@@ -334,7 +334,7 @@ class MTV_PUBLIC TV : public QObject
     void ChangeChannel(PlayerContext*, int direction);
     void ChangeChannel(PlayerContext*, uint chanid, const QString &channum);
     void PauseLiveTV(PlayerContext*);
-    void UnpauseLiveTV(PlayerContext*);
+    void UnpauseLiveTV(PlayerContext*, bool bQuietly = false);
 
     void ShowPreviousChannel(PlayerContext*);
     void PopPreviousChannel(PlayerContext*, bool immediate_change);