Ticket #4504: guide_unav.diff

libs/libmyth/uitypes.cpp

@@ -1 @@
-
 #include <iostream>
 #include <math.h>
 
@@ -613 +612 @@
     {
         for (data = allData[i].first(); data; data = allData[i].next())
         {
-            if (data->recStat == 0)
+            if (data->unavStat && (data->recStat != 1))
+                drawBox(dr, data, unavcolor);
+            else if (data->recStat == 0)
                 drawBackground(dr, data);
             else if (data->recStat == 1)
                 drawBox(dr, data, reccolor);
@@ -842 +843 @@
 
 void UIGuideType::SetProgramInfo(int row, int col, const QRect &area,
                                  const QString &title, const QString &genre,
-                                 int arrow, int recType, int recStat,
+                                 int arrow, int recType, int recStat, bool unavStat,
                                  bool selected)
 {
     (void)col;
-    UIGTCon *data = new UIGTCon(area, title, genre, arrow, recType, recStat);
+    UIGTCon *data = new UIGTCon(area, title, genre, arrow, recType, recStat, unavStat);
 
     allData[row].append(data);
 
     if (drawCategoryColors)
     {
         data->categoryColor = categoryColors[data->category.lower()];
+
         if (!data->categoryColor.isValid())
             data->categoryColor = categoryColors["none"];
     }

libs/libmyth/uitypes.h

@@ -232 +232 @@
     UIGuideType(const QString &name, int order);
     ~UIGuideType();
 
-    enum FillType { Alpha = 10, Dense, Eco, Solid };
+    enum FillType { Alpha = 10, Dense, Eco, Solid, Unavailable };
 
     void Draw(QPainter *dr, int drawlayer, int context);
 
@@ -246 +246 @@
     void SetNumRows(int numRows) { this->numRows = numRows; }
     void SetWindow(MythDialog *win) { window = win; }
 
-    void SetRecordingColors(const QString &reccol, const QString &concol)
-                  { reccolor = QColor(reccol); concolor = QColor(concol); }
+    void SetRecordingColors(const QString &reccol, const QString &concol,
+                            const QString &unavcol)
+                  { reccolor = QColor(reccol); concolor = QColor(concol);
+                    unavcolor = QColor(unavcol); }
     void SetSelectorColor(const QString &col) { selcolor = QColor(col); }
     void SetSolidColor(const QString &col) { solidcolor = QColor(col); }
     void SetCategoryColors(const QMap<QString, QString> &catColors);
@@ -259 +261 @@
     void LoadImage(int, const QString &file);
     void SetProgramInfo(int row, int col, const QRect &area,
                         const QString &title, const QString &category,
-                        int arrow, int recType, int recStat, bool selected);
+                        int arrow, int recType, int recStat, bool unavStat,
+                        bool selected);
     void ResetData();
     void ResetRow(int row);
     void SetProgPast(int ppast);
@@ -269 +272 @@
     class UIGTCon
     {
       public:
-        UIGTCon() { arrow = recType = recStat = 0; };
+        UIGTCon() { arrow = recType = recStat = 0; unavStat = false; };
         UIGTCon(const QRect &drawArea, const QString &title,
-                const QString &category, int arrow, int recType, int recStat)
+                const QString &category, int arrow, int recType,
+                int recStat, bool unavStat)
         {
             this->drawArea = drawArea;
             this->title = title;
@@ -279 +283 @@
             this->arrow = arrow;
             this->recType = recType;
             this->recStat = recStat;
+            this->unavStat = unavStat;
         }
 
         UIGTCon(const UIGTCon &o)
@@ -290 +295 @@
             arrow = o.arrow;
             recType = o.recType;
             recStat = o.recStat;
+            unavStat = o.unavStat;
         }
 
         QRect drawArea;
@@ -299 +305 @@
         int arrow;
         int recType;
         int recStat;
+        bool unavStat;
     };
 
     void drawBackground(QPainter *dr, UIGTCon *data);
@@ -331 +338 @@
 
     QColor reccolor;
     QColor concolor;
+    QColor unavcolor;
 
     int filltype;
     bool cutdown;

libs/libmyth/xmlparse.cpp

@@ -725 +725 @@
     QString selcolor = "";
     QString reccolor = "";
     QString concolor = "";
+    QString unavcolor = "";
     QRect area;
     QPoint textoff = QPoint(0, 0);
     bool cutdown = true;
@@ -799 +800 @@
             {
                 concolor = getFirstText(info);
             }
+            else if (info.tagName() == "unavailablecolor")
+            {
+                unavcolor = getFirstText(info);
+            }
             else if (info.tagName() == "multiline")
             {
                 if (getFirstText(info).lower() == "yes")
@@ -884 +889 @@
     guide->SetTextOffset(textoff);
     if (concolor == "")
         concolor = reccolor;
-    guide->SetRecordingColors(reccolor, concolor);
+    guide->SetRecordingColors(reccolor, concolor, unavcolor);
     guide->SetSelectorColor(selcolor);
     for (int i = 1; i <= 7; i++)
         guide->LoadImage(i, recImgs[i]);

libs/libmythtv/guidegrid.cpp

@@ -1054 +1054 @@
     QRect tempRect;
     bool isCurrent = false;
 
+    bool channelsChanged = false;
+
+    uint chanNumber = row + m_currentStartChannel;
+    if (chanNumber >= m_channelInfos.size())
+        chanNumber -= m_channelInfos.size();
+
+    PixmapChannel *chinfo = GetChannelInfo(chanNumber);
+
+    bool unavStat = isUnavailable(chinfo->chanid, chanNumber, channelsChanged);
+
     for (int x = 0; x < DISPLAY_TIMES; x++)
     {
         proginfo = m_programInfos[row][x];
@@ -1150 +1160 @@
 
                 type->SetProgramInfo(row, cnt, tempRect, proginfo->title,
                                      proginfo->category, arrow, recFlag, 
-                                     recStat, isCurrent);
+                                     recStat, unavStat, isCurrent);
 
                 cnt++;
             }
@@ -1185 +1195 @@
 
     if (r.intersects(channelRect) && paintChannels(&p))
     {
+        chan_unavailable.clear();
         fillProgramInfos();
         update(programRect|curInfoRect|r);
         qApp->unlock();
@@ -1328 +1339 @@
     UIImageType *itype = NULL;
     container = theme->GetSet("chanbar");
     infocontainer = theme->GetSet("program_info");
+
     if (container)
         type = (UIBarType *)container->GetType("chans");
     if (infocontainer)
@@ -1346 +1358 @@
         if (chanNumber >= m_channelInfos.size())
             chanNumber -= m_channelInfos.size();
         if (chanNumber >= m_channelInfos.size())
-            break;  
+            break;
 
         chinfo = GetChannelInfo(chanNumber);
 
-        bool unavailable = false;
-        if (m_player && !m_player->IsTunable(chinfo->chanid, true))
-        {
-            unavailable = true;
+        bool unavailable = isUnavailable(chinfo->chanid, chanNumber, channelsChanged);
 
-            // Try alternates with same channum if applicable
-            uint alt = GetAlternateChannelIndex(chanNumber, true);
-            if (alt != m_channelInfoIdx[chanNumber])
-            {
-                unavailable = false;
-                m_channelInfoIdx[chanNumber] = alt;
-                chinfo = GetChannelInfo(chanNumber);
-                channelsChanged = true;
-            }
+        if (channelsChanged)
+            chinfo = GetChannelInfo(chanNumber);
 
-            // Try alternates with different channum if applicable
-            if (unavailable && GetProgramList(chinfo->chanid).count())
-            {
-                alt = GetAlternateChannelIndex(chanNumber, false);
-                unavailable = (alt == m_channelInfoIdx[chanNumber]);
-            }
-        }
+        if (!chinfo || (chanNumber >= m_channelInfos.size()))
+            break;
 
         if ((y == (unsigned int)2 && scrolltype != 1) || 
             ((signed int)y == m_currentRow && scrolltype == 1))
@@ -1566 +1563 @@
     p->drawPixmap(pr.topLeft(), pix);
 }
 
+bool GuideGrid::isUnavailable(uint chanid, uint chanNumber, bool &channelsChanged)
+{
+    if (chan_unavailable.contains(chanNumber))
+      return chan_unavailable[chanNumber];
+
+    bool unavailable = false;
+    if (m_player && !m_player->IsTunable(chanid, true))
+    {
+        unavailable = true;
+
+        // Try alternates with same channum if applicable
+        uint alt = GetAlternateChannelIndex(chanNumber, true);
+        if (alt != m_channelInfoIdx[chanNumber])
+        {
+            unavailable = false;
+            m_channelInfoIdx[chanNumber] = alt;
+            channelsChanged = true;
+        }
+
+        // Try alternates with different channum if applicable
+        if (unavailable && GetProgramList(chanid).count())
+        {
+            alt = GetAlternateChannelIndex(chanNumber, false);
+            unavailable = (alt == m_channelInfoIdx[chanNumber]);
+        }
+    }
+
+    chan_unavailable[chanNumber] = unavailable;
+
+    return unavailable;
+}
+
 void GuideGrid::toggleGuideListing()
 {
     showFavorites = (!showFavorites);
@@ -1900 +1929 @@
 
 void GuideGrid::enter()
 {
+    bool channelsChanged = false;
+
+    uint chanNumber = m_currentRow + m_currentStartChannel;
+    if (chanNumber >= m_channelInfos.size())
+        chanNumber -= m_channelInfos.size();
+
+    PixmapChannel *chinfo = GetChannelInfo(chanNumber);
+
+    if (isUnavailable(chinfo->chanid, chanNumber, channelsChanged))
+      return;
+
     if (timeCheck)
     {
         timeCheck->stop();

libs/libmythtv/guidegrid.h

@@ -109 +109 @@
     void paintPrograms(QPainter *);
     void paintCurrentInfo(QPainter *);
     void paintInfo(QPainter *);
+
+    bool isUnavailable(uint chanid, uint chanNumber, bool &channelsChanged);
  
     void resizeImage(QPixmap *, QString);
     void LoadWindow(QDomElement &);
@@ -211 +213 @@
     bool jumpToChannelActive;
     bool jumpToChannelHasRect;
     QTimer *jumpToChannelTimer;
+
+    QMap<uint,bool> chan_unavailable;
 };
 
 #endif