Ticket #437: eit-transport-walk.diff

libs/libmythtv/eitscanner.cpp

@@ -135 +135 @@
 
     if (!activeScanChannels.size())
     {
+        QMap<uint, MythDeque<QString> > chanByMplex;
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare(
-            "SELECT channum "
+            "SELECT channum, mplexid "
             "FROM channel, cardinput, capturecard "
             "WHERE cardinput.sourceid = channel.sourceid AND "
             "      capturecard.cardid = cardinput.cardid AND "
             "      channel.mplexid      IS NOT NULL      AND "
-            "      cardinput.cardid   = :CARDID "
-            "ORDER BY cardinput.sourceid, atscsrcid");
+            "      capturecard.dvb_on_demand = 0         AND "
+            "      cardinput.cardid   = :CARDID ");
         query.bindValue(":CARDID", rec->GetCaptureCardNum());
 
         if (!query.exec() || !query.isActive())
@@ -153 +154 @@
         }
 
         while (query.next())
-            activeScanChannels << query.value(0).toString();
+            chanByMplex[query.value(1).toUInt()].push_back(query.value(0).toString());
+
+        QValueList<uint> keyList = chanByMplex.keys();
+        QValueList<uint>::iterator curMplex = keyList.begin();
+        int i = 0;
+        while (i < query.size())
+        {
+            if(chanByMplex[*curMplex].size() != 0)
+            {
+                activeScanChannels << chanByMplex[*curMplex].front();
+                chanByMplex[*curMplex].pop_front();
+                i++;
+            }
+            if(++curMplex == keyList.end())
+                curMplex = keyList.begin();
+        }
         activeScanNextChan = activeScanChannels.begin();
     }