[mythtv] Not displaying channum when option chosen

[Andrew M. Bishop]

I have been through version 0.14 of mythtv and removed most of the
remaining instances where the channel number is displayed even though
the user has selected the option not to display it.  The patches are
below.

The only other place that I can see that channum is used instead of
chanid is in live TV where it is displayed in the OSD and used as the
input and a few settings like the one that specifies the first channel
that the program guide displays.



Program Finder

-------------------- progfind.cpp --------------------
--- /home/amb/mythtv/v0.14/mythtv/libs/libmythtv/progfind.orig.cpp	2004-01-29 03:27:07.000000000 +0000
+++ /home/amb/mythtv/v0.14/mythtv/libs/libmythtv/progfind.cpp	2004-02-01 09:28:33.000000000 +0000
@@ -332,7 +332,8 @@
         QString channame = "";
         QString recording = "";
 
-        channum = showData[curShow].channelNum;
+        if(!gContext->GetNumSetting("DisplayChanNum"))
+            channum = showData[curShow].channelNum;
         channame = showData[curShow].channelCallsign;
         title = progData[curProgram];
         timedate = showData[curShow].startDisplay + " - " +
-------------------- progfind.cpp --------------------


Program List

-------------------- proglist.cpp --------------------
--- /home/amb/mythtv/v0.14/mythtv/libs/libmythtv/proglist.orig.cpp	2004-01-30 18:03:54.000000000 +0000
+++ /home/amb/mythtv/v0.14/mythtv/libs/libmythtv/proglist.cpp	2004-02-01 10:06:03.000000000 +0000
@@ -569,6 +569,7 @@
             gContext->GetSetting("ChannelOrdering", "channum + 0");
         QString querystr = "SELECT channel.chanid, channel.channum, "
             "channel.callsign FROM channel ORDER BY " + channelOrdering + ";";
+        int displaychannum = gContext->GetNumSetting("DisplayChanNum");
         QSqlQuery query;
         query.exec(querystr);
         if (query.isActive() && query.numRowsAffected())
@@ -578,7 +579,9 @@
                 QString chanid = query.value(0).toString();
                 QString chantext;
                 QString channum = query.value(1).toString();
-                if (channum != QString::null && channum != "")
+                if(displaychannum)
+                    chantext="";
+                else if (channum != QString::null && channum != "")
                     chantext = channum;
                 else
                     chantext = "???";
@@ -817,6 +820,7 @@
             ltype->SetUpArrow(skip > 0);
             ltype->SetDownArrow(skip + listsize < itemCount);
 
+            int displaychannum = gContext->GetNumSetting("DisplayChanNum");
             int i;
             for (i = 0; i < listsize; i++)
             {
@@ -826,7 +830,10 @@
                 ProgramInfo *pi = itemList.at(i+skip);
 
                 ltype->SetItemText(i, 1, pi->startts.toString(timeFormat));
-                ltype->SetItemText(i, 2, pi->chanstr + " " + pi->chansign);
+                if(displaychannum)
+                    ltype->SetItemText(i, 2, pi->chansign);
+                else
+                    ltype->SetItemText(i, 2, pi->chanstr + " " + pi->chansign);
 
                 if (pi->subtitle == "")
                     tmptitle = pi->title;
-------------------- proglist.cpp --------------------


Channel Record Priorities (I couldn't work out how to sort by chanid
instead of channum, so the list remains sorted in a strange order).

-------------------- channelrecpriority.cpp --------------------
--- /home/amb/mythtv/v0.14/mythtv/programs/mythfrontend/channelrecpriority.orig.cpp	2004-01-28 22:34:59.000000000 +0000
+++ /home/amb/mythtv/v0.14/mythtv/programs/mythfrontend/channelrecpriority.cpp	2004-02-01 11:29:29.000000000 +0000
@@ -431,7 +431,7 @@
         }
     }
     else if (!result.isActive())
-        MythContext::DBError("Get channel recording prioritiess query", query);
+        MythContext::DBError("Get channel recording priorities query", query);
 }
 
 typedef struct RecPriorityInfo 
@@ -555,6 +555,8 @@
             ltype->ResetList();
             ltype->SetActive(true);
 
+            int displaychannum = gContext->GetNumSetting("DisplayChanNum");
+
             QMap<QString, ChannelInfo>::Iterator it;
             for (it = channelData.begin(); it != channelData.end(); ++it)
             {
@@ -572,8 +574,11 @@
                             curitem = new ChannelInfo(*chanInfo);
                             ltype->SetItemCurrent(cnt);
                         }
-                        
-                        ltype->SetItemText(cnt, 1, chanInfo->chanstr);
+
+                        if(displaychannum)
+                            ltype->SetItemText(cnt, 1, "");
+                        else
+                            ltype->SetItemText(cnt, 1, chanInfo->chanstr);
                         ltype->SetItemText(cnt, 2, chanInfo->callsign);
                         if (chanInfo->recpriority.toInt() > 0)
                             ltype->SetItemText(cnt, 3, "+");
-------------------- channelrecpriority.cpp --------------------

-- 
Andrew.
----------------------------------------------------------------------
Andrew M. Bishop                             amb at gedanken.demon.co.uk
                                      http://www.gedanken.demon.co.uk/