Ticket #10377: 10377-v1.patch

mythtv/libs/libmythtv/tv_play.cpp

@@ -6996 +6996 @@
         UpdateOSDInput(ctx);
 }
 
+static uint get_chanid(const PlayerContext *ctx,
+                       uint cardid, const QString &channum)
+{
+    uint chanid = 0, cur_sourceid = 0;
+    // try to find channel on current input
+    if (ctx && ctx->playingInfo && ctx->playingInfo->GetSourceID())
+    {
+        cur_sourceid = ctx->playingInfo->GetSourceID();
+        chanid = max(ChannelUtil::GetChanID(cur_sourceid, channum), 0);
+        if (chanid)
+            return chanid;
+    }
+    // try to find channel on all inputs
+    vector<uint> inputs = CardUtil::GetInputIDs(cardid);
+    for (vector<uint>::const_iterator it = inputs.begin();
+         it != inputs.end(); ++it)
+    {
+        uint sourceid = CardUtil::GetSourceID(*it);
+        if (cur_sourceid == sourceid)
+            continue; // already tested above
+        if (sourceid)
+        {
+            chanid = max(ChannelUtil::GetChanID(sourceid, channum), 0);
+            if (chanid)
+                return chanid;
+        }
+    }
+    return chanid;
+}
+
 void TV::ChangeChannel(PlayerContext *ctx, uint chanid, const QString &chan)
 {
     LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("ChangeChannel(%1, '%2') ")
@@ -7006 +7036 @@
 
     QString channum = chan;
     QStringList reclist;
+    QSet<uint> tunable_on;
 
     QString oldinputname = ctx->recorder->GetInput();
 
@@ -7036 +7067 @@
             ctx->recorder->CheckChannelPrefix(chan,  pref_cardid,
                                               dummy, needed_spacer);
 
+            LOG(VB_CHANNEL, LOG_INFO, LOC +
+                QString("CheckChannelPrefix(%1, pref_cardid %2, %3, %4) "
+                        "cardid %5")
+                .arg(chan).arg(pref_cardid).arg(dummy).arg(needed_spacer)
+                .arg(cardid));
+
             channum = add_spacer(chan, needed_spacer);
-            getit = (pref_cardid != cardid);
+            if (pref_cardid != cardid)
+            {
+                getit = true;
+            }
+            else
+            {
+                if (!chanid)
+                    chanid = get_chanid(ctx, cardid, chan);
+                tunable_on = IsTunableOn(ctx, chanid, true);
+                getit = !tunable_on.contains(cardid);
+            }
         }
 
         if (getit)
-            reclist = ChannelUtil::GetValidRecorderList(chanid, channum);
+        {
+            QStringList tmp =
+                ChannelUtil::GetValidRecorderList(chanid, channum);
+            if (tunable_on.empty())
+            {
+                if (!chanid)
+                    chanid = get_chanid(ctx, ctx->GetCardID(), chan);
+                tunable_on = IsTunableOn(ctx, chanid, true);
+            }
+            QStringList::const_iterator it = tmp.begin();
+            for (; it != tmp.end(); ++it)
+            {
+                if (!chanid || tunable_on.contains((*it).toUInt()))
+                    reclist.push_back(*it);
+            }
+        }
     }
 
     if (reclist.size())
@@ -7718 +7780 @@
 
 bool TV::IsTunable(const PlayerContext *ctx, uint chanid, bool use_cache)
 {
-    LOG(VB_PLAYBACK, LOG_INFO, QString("IsTunable(%1)").arg(chanid));
+    return !IsTunableOn(ctx,chanid,use_cache).empty();
+}
+
+QSet<uint> TV::IsTunableOn(
+    const PlayerContext *ctx, uint chanid, bool use_cache)
+{
+    LOG(VB_CHANNEL, LOG_INFO, QString("IsTunableOn(%1)").arg(chanid));
+    QSet<uint> tunable_cards;
 
     if (!chanid)
-        return false;
+        return tunable_cards;
 
     uint mplexid = ChannelUtil::GetMplexID(chanid);
     mplexid = (32767 == mplexid) ? 0 : mplexid;
@@ -7797 +7866 @@
                 inputs[j].mplexid != mplexid)
                 continue;
 
-            LOG(VB_PLAYBACK, LOG_INFO, QString("IsTunable(%1) -> true\n")
-                    .arg(chanid));
+            LOG(VB_CHANNEL, LOG_INFO, QString("IsTunableOn(%1) added %2\n")
+                .arg(chanid).arg(cardids[i]));
 
-            return true;
+            tunable_cards.insert(cardids[i]);
+
+            break;
         }
     }
 
-    LOG(VB_PLAYBACK, LOG_INFO, QString("IsTunable(%1) -> false\n").arg(chanid));
-
-    return false;
+    return tunable_cards;
 }
 
 void TV::ClearTunableCache(void)

mythtv/libs/libmythtv/tv_play.h

@@ -24 +24 @@
 #include <QHash>
 #include <QTime>
 #include <QMap>
+#include <QSet>
 
 // MythTV
 #include "mythdeque.h"
@@ -261 +262 @@
     bool StartEmbedding(const QRect&);
     void StopEmbedding(void);
     bool IsTunable(const PlayerContext*, uint chanid, bool use_cache = false);
+    QSet<uint> IsTunableOn(const PlayerContext*, uint chanid, bool use_cache);
     void ClearTunableCache(void);
     void ChangeChannel(const PlayerContext*, const DBChanList &options);
     void DrawUnusedRects(void);