Ticket #1599: activescan_mplex.patch

libs/libmythtv/eitscanner.cpp

@@ -113 +113 @@
             {
                 rec->SetChannel(*activeScanNextChan, TVRec::kFlagEITScan);
                 VERBOSE(VB_GENERAL, LOC + 
-                        QString("Now looking for EIT data on channel %1")
+                        QString("Now looking for EIT data on multiplex of "
+                                "channel %1")
                         .arg(*activeScanNextChan));
             }
 
@@ -192 +193 @@
     {
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare(
-            "SELECT channum, mplexid "
+            "SELECT min(channum), mplexid "
             "FROM channel, cardinput, capturecard, videosource "
             "WHERE cardinput.sourceid   = channel.sourceid AND "
             "      videosource.sourceid = channel.sourceid AND "
@@ -201 +202 @@
             "      useonairguide        = 1                AND "
             "      useeit               = 1                AND "
             "      cardinput.cardid     = :CARDID "
+            "GROUP BY mplexid "
             "ORDER BY cardinput.sourceid, atscsrcid");
         query.bindValue(":CARDID", rec->GetCaptureCardNum());
 
@@ -240 +242 @@
     }
 
     VERBOSE(VB_EIT, "StartActiveScan called with "<<
-            activeScanChannels.size()<<" channels");
+            activeScanChannels.size()<<" multiplexes");
 
     // Start at a random channel.This is so that multiple cards with
     // the same source don't all scan the same channels in the same 
@@ -249 +251 @@
     {
         uint randomStart = random() % activeScanChannels.size();
         activeScanNextChan = activeScanChannels.at(randomStart);
-    }
 
-    if (activeScanChannels.size())
-    {
         activeScanNextTrig = QDateTime::currentDateTime();
         activeScanTrigTime = max_seconds_per_source;
         // Add a little randomness to trigger time so multiple