Ticket #199: myth_guide_groups_r10968.diff

libs/libmythtv/channelutil.cpp

@@ -1265 +1265 @@
                            dvb_transportid, dvb_networkid);
 }
 
-DBChanList ChannelUtil::GetChannels(uint sourceid, bool vis_only, QString grp)
+DBChanList ChannelUtil::GetChannels(uint sourceid, bool vis_only, QString grp,
+                                    int guideGroup)
 {
     DBChanList list;
     QMap<uint,uint> favorites;
@@ -1282 +1283 @@
     }
 
     QString qstr =
-        "SELECT channum, callsign, chanid, "
+        "SELECT channum, callsign, channel.chanid, "
         "       atsc_major_chan, atsc_minor_chan, "
         "       name, icon, visible "
         "FROM channel ";
 
+    if (guideGroup > -1)
+        qstr += ", guidechannels ";
+
     if (sourceid)
         qstr += QString("WHERE sourceid='%1' ").arg(sourceid);
     else
@@ -1297 +1301 @@
     if (vis_only)
         qstr += "AND visible=1 ";
 
+    if (guideGroup > -1)
+        qstr += "AND channel.chanid = guidechannels.chanid AND "
+                "    guidechannels.groupid = :GUIDEGROUP ";
+
     if (!grp.isEmpty())
         qstr += QString("GROUP BY %1 ").arg(grp);
 
     query.prepare(qstr);
+
+    if (guideGroup > -1)
+        query.bindValue(":GUIDEGROUP", guideGroup);
+
     if (!query.exec() || !query.isActive())
     {
         MythContext::DBError("get channels -- sourceid", query);
         return list;
     }
 
+    if ((guideGroup > -1) && (query.size() == 0))
+    {
+        VERBOSE(VB_PLAYBACK, QString("GetChannels(): failed to find any channels "
+            "associated with group %1").arg(guideGroup));
+        return GetChannels(sourceid, vis_only, grp, -1);
+    }
+
     while (query.next())
     {
         if (query.value(0).toString().isEmpty() || !query.value(2).toUInt())

libs/libmythtv/channelutil.h

@@ -146 +146 @@
     static QString GetVideoFilters(uint sourceid, const QString &channum)
         { return GetChannelValueStr("videofilters", sourceid, channum); }
 
-    static DBChanList GetChannels(uint srcid, bool vis_only, QString grp="");
+    static DBChanList GetChannels(uint srcid, bool vis_only, QString grp="",
+                                  int guideGroup = -1);
     static void    SortChannels(DBChanList &list, const QString &order,
                                 bool eliminate_duplicates = false);
     static void    EliminateDuplicateChanNum(DBChanList &list);

libs/libmythtv/guidegrid.cpp

@@ -35 +35 @@
 
 bool RunProgramGuide(uint &chanid, QString &channum,
                      bool thread, TV *player,
-                     bool allowsecondaryepg)
+                     bool allowsecondaryepg,
+                     int guideGroup)
 {
     bool channel_changed = false;
 
@@ -46 +47 @@
 
     GuideGrid *gg = new GuideGrid(gContext->GetMainWindow(),
                                   chanid, channum,
-                                  player, allowsecondaryepg, "guidegrid");
+                                  player, allowsecondaryepg,
+                                  guideGroup, "guidegrid");
 
     gg->Show();
 
@@ -83 +85 @@
 GuideGrid::GuideGrid(MythMainWindow *parent,
                      uint chanid, QString channum,
                      TV *player, bool allowsecondaryepg,
+                     int guideGroup,
                      const char *name)
          : MythDialog(parent, name)
 {
@@ -91 +94 @@
     int maxchannel = 0;
     m_currentStartChannel = 0;
 
+    m_currentGuideGroup = guideGroup;
+
     m_player = player;
 
     m_context = 0;
@@ -562 +567 @@
 {
     m_channelInfos.clear();
 
+    // Handle any special guide groups
+    if (m_currentGuideGroup == GUIDEGROUP_FAVORITES)
+        showFavorites = true;
+
     DBChanList channels = ChannelUtil::GetChannels(0, true,
-                                                   "channum, callsign");
+                                                   "channum, callsign",
+                                                   m_currentGuideGroup);
     ChannelUtil::SortChannels(channels, channelOrdering, true);
 
     if (showFavorites)

libs/libmythtv/guidegrid.h

@@ -25 +25 @@
 #define MAX_DISPLAY_CHANS 12
 #define MAX_DISPLAY_TIMES 30
 
+#define GUIDEGROUP_FAVORITES   9999  // Guide Group Favorites
+
 // Use this function to instantiate a guidegrid instance.
 bool RunProgramGuide(uint &startChanId, QString &startChanNum,
                      bool thread = false, TV *player = NULL,
-                     bool allowsecondaryepg = true);
+                     bool allowsecondaryepg = true,
+                     int guideGroup = -1);
 
 
 class GuideGrid : public MythDialog
@@ -38 +41 @@
     GuideGrid(MythMainWindow *parent,
               uint chanid = 0, QString channum = "",
               TV *player = NULL, bool allowsecondaryepg = true,
+              int guideGroup = -1,
               const char *name = "GuideGrid");
    ~GuideGrid();
 
@@ -108 +112 @@
 
     int m_context;
 
+    int m_currentGuideGroup;
+
     bool selectChangesChannel;
     int selectRecThreshold;
     

libs/libmythtv/tv_play.cpp

@@ -378 +378 @@
         return false;
     }
 
+    currentGuideGroup = -1;
+    GetGuideGroups();
+
     baseFilters         += gContext->GetSetting("CustomFilters");
     db_time_format       = gContext->GetSetting("TimeFormat", "h:mm AP");
     db_short_date_format = gContext->GetSetting("ShortDateFormat", "M/d");
@@ -2744 +2747 @@
                 ToggleInputs();
             else if (action == "SWITCHCARDS")
                 SwitchCards();
-            else if (action == "GUIDE")
-                EditSchedule(kScheduleProgramGuide);
+            else if (!action.find("GUIDE"))
+                ProcessGuideEntry(action);
             else if (action == "TOGGLEPIPMODE")
                 TogglePIPView();
             else if (action == "TOGGLEPIPWINDOW")
@@ -2798 +2801 @@
             }
             else if (action == "JUMPTODVDROOTMENU")
                 activenvp->GoToDVDMenu("menu");
-            else if (action == "GUIDE")
-                EditSchedule(kScheduleProgramGuide);
+            else if (!action.find("GUIDE"))
+                ProcessGuideEntry(action);
             else if (action == "FINDER")
                 EditSchedule(kScheduleProgramFinder);
             else if (action == "TOGGLEEDIT" && !activerbuffer->isDVD())
@@ -2838 +2841 @@
     }
 }
 
+void TV::ProcessGuideEntry(QString action)
+{
+    currentGuideGroup = -1;
+
+    if (action == "GUIDE_FAVORITES")
+        currentGuideGroup = GUIDEGROUP_FAVORITES;
+    else if (!action.find("GUIDE_"))
+    {
+        action.remove("GUIDE_");
+
+        QMapIterator<QString, int> it;
+
+        for(it = guideGroups.begin(); it != guideGroups.end(); ++it)
+        {
+            if(action == it.key())
+                currentGuideGroup = it.data();
+        }
+    }
+
+    EditSchedule(kScheduleProgramGuide);
+}
+
 void TV::processNetworkControlCommand(QString command)
 {
     QStringList tokens = QStringList::split(" ", command);
@@ -4761 +4786 @@
         return;
     }
 
+    if (currentGuideGroup > -1)
+        VERBOSE(VB_PLAYBACK, QString("doEditSchedule(): using guide groupid %1")
+            .arg(currentGuideGroup));
+    else
+        VERBOSE(VB_PLAYBACK, "doEditSchedule(): guide defaulting to all channels");
+
     // Resize window to the MythTV GUI size
     MythMainWindow *mwnd = gContext->GetMainWindow();
     bool using_gui_size_for_tv = gContext->GetNumSetting("GuiSizeForTV", 0);
@@ -4787 +4818 @@
             allowsecondary = nvp->getVideoOutput()->AllowPreviewEPG();
 
         // Start up EPG
-        changeChannel = RunProgramGuide(chanid, channum, true, this, allowsecondary);
+        changeChannel = RunProgramGuide(chanid, channum, true, this,
+                                        allowsecondary, currentGuideGroup);
 
         StopEmbeddingOutput();
     }
@@ -6118 +6150 @@
         ToggleLetterbox(action.right(1).toInt());
         hidetree = false;
     }
-    else if (action == "GUIDE")
-        EditSchedule(kScheduleProgramGuide);
+    else if (!action.find("GUIDE"))
+        ProcessGuideEntry(action);
     else if (action == "FINDER")
         EditSchedule(kScheduleProgramFinder);
     else if (action == "SCHEDULE")
@@ -6309 +6341 @@
         if (!freeRecorders)
             freeRecorders = RemoteGetFreeRecorderCount();
 
-        item = new OSDGenericTree(treeMenu, tr("Program Guide"), "GUIDE");
+        item = new OSDGenericTree(treeMenu, tr("Program Guide"), "GUIDE");      
+        BuildOSDGuideMenu(item);
 
         if (freeRecorders)
         {
@@ -6534 +6567 @@
     subitem = new OSDGenericTree(item, "120 " + tr("minutes"), "TOGGLESLEEP120");
 }
 
+void TV::BuildOSDGuideMenu(OSDGenericTree *treeMenu)
+{
+    OSDGenericTree *subitem;
+
+    subitem = new OSDGenericTree(treeMenu, tr("All Channels"), "GUIDE");
+    subitem = new OSDGenericTree(treeMenu, tr("Favorites"), "GUIDE_FAVORITES");
+
+    QMapIterator<QString, int> it;
+
+    for(it = guideGroups.begin(); it != guideGroups.end(); ++it)
+    {
+        QString name = it.key();
+        QString int_name = name;
+        int_name.prepend("GUIDE_");
+
+        subitem = new OSDGenericTree(treeMenu, name, int_name.latin1());
+    }
+}
+
+void TV::GetGuideGroups(void)
+{
+    guideGroups.clear();
+
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT groupid, name FROM guidegroups ORDER BY groupid");
+
+    if (query.exec() && query.isActive() && query.size() > 0)
+        while(query.next())
+            guideGroups.insert(query.value(1).toString(), query.value(0).toInt());
+}
+
 bool TV::FillMenuTracks(OSDGenericTree *treeMenu, uint type)
 {
     QString mainMsg = QString::null;

libs/libmythtv/tv_play.h

@@ -213 +213 @@
     void ChangeTrack(uint type, int dir);
     void SetTrack(uint type, int trackNo);
 
+    void GetGuideGroups(void);
+    void ProcessGuideEntry(QString action);
+
     // key queue commands
     void AddKeyToInputQueue(char key);
     void ClearInputQueues(bool hideosd = false); 
@@ -327 +330 @@
     void DoChangePictureAttribute(int type, int control, bool up);
 
     void BuildOSDTreeMenu(void);
+    void BuildOSDGuideMenu(OSDGenericTree *treeMenu);
     void ShowOSDTreeMenu(void);
 
     void UpdateLCD(void);
@@ -411 +415 @@
     bool needToJumpMenu;
     QMap<QString,ProgramList> progLists;
 
+    QMap<QString,int> guideGroups;
+    int currentGuideGroup;
+
     mutable QMutex chanEditMapLock; ///< Lock for chanEditMap and ddMap
     InfoMap   chanEditMap;          ///< Channel Editing initial map
     DDKeyMap  ddMap;                ///< DataDirect channel map