Ticket #4495: myth_guidespeed2_r15496.diff

libs/libmythtv/guidegrid.cpp

@@ -638 +638 @@
         if (with_same_channum != same_channum)
             continue;
 
-        if (!ciinfo || !m_player->IsTunable(ciinfo->chanid))
+        if (!ciinfo || !m_player->IsTunable(ciinfo->chanid, true))
             continue;
 
         if (with_same_channum ||
@@ -1335 +1335 @@
 
     PixmapChannel *chinfo = GetChannelInfo(m_currentStartChannel);
 
+    if (m_player)
+        m_player->ClearTunableCache();
+
     bool showChannelIcon = gContext->GetNumSetting("EPGShowChannelIcon", 0);
 
     for (unsigned int y = 0; (y < (unsigned int)DISPLAY_CHANS) && chinfo; y++)
@@ -1348 +1351 @@
         chinfo = GetChannelInfo(chanNumber);
 
         bool unavailable = false;
-        if (m_player && !m_player->IsTunable(chinfo->chanid))
+        if (m_player && !m_player->IsTunable(chinfo->chanid, true))
         {
             unavailable = true;
 

libs/libmythtv/tv_play.cpp

@@ -5592 +5592 @@
     infoMap["programid"]   = programid;
 }
 
-bool TV::IsTunable(uint chanid)
+bool TV::IsTunable(uint chanid, bool use_cache)
 {
     VERBOSE(VB_PLAYBACK, QString("IsTunable(%1)").arg(chanid));
 
@@ -5618 +5618 @@
 
     for (uint i = 0; i < cardids.size(); i++)
     {
-        vector<InputInfo> inputs = 
-            RemoteRequestFreeInputList(cardids[i], excluded_cards);
+        vector<InputInfo> inputs;
+        if (!use_cache || !free_inputs.contains(cardids[i]))
+        {
+            inputs = RemoteRequestFreeInputList(cardids[i], excluded_cards);
+            free_inputs[cardids[i]] = inputs;
+        }
+        else
+            inputs = free_inputs[cardids[i]];
 
 #if 0
         cout << "inputs[" << cardids[i] << "]: ";
@@ -5649 +5655 @@
     return false;
 }
 
+void TV::ClearTunableCache(void)
+{
+    free_inputs.clear();
+}
+
 void TV::EmbedOutput(WId wid, int x, int y, int w, int h)
 {
     embedWinID = wid;

libs/libmythtv/tv_play.h

@@ -19 +19 @@
 #include "programinfo.h"
 #include "channelutil.h"
 #include "videoouttypes.h"
+#include "inputinfo.h"
 
 #include <qobject.h>
 
@@ -138 +139 @@
     void EmbedOutput(WId wid, int x, int y, int w, int h);
     void StopEmbeddingOutput(void);
     bool IsEmbedding(void);
-    bool IsTunable(uint chanid);
+    bool IsTunable(uint chanid, bool use_cache=false);
+    void ClearTunableCache(void);
     void ChangeChannel(const DBChanList &options);
 
     void DrawUnusedRects(bool sync);
@@ -451 +453 @@
     bool    jumped_back; ///< Used by PromptDeleteRecording 
     vector<int> ff_rew_speeds;
 
+    QMap< uint,vector<InputInfo> > free_inputs;
+
     uint    vbimode;
 
     // State variables