Ticket #1155: dvb-multiple-eit2.diff

libs/libmythtv/dvbchannel.cpp

@@ -136 +136 @@
     channelnames.clear();
     inputChannel.clear();
     inputTuneTo.clear();
+    sourceid.clear();
     
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(
         "SELECT cardinputid, inputname, "
         "       if (tunechan='', 'Undefined', tunechan), "
-        "       if (startchan, startchan, '') "
+        "       if (startchan, startchan, ''), "
+        "       sourceid "
         "FROM cardinput "
         "WHERE cardid = :CARDID");
     query.bindValue(":CARDID", GetCardID());
@@ -166 +168 @@
         channelnames[inputNum]    = query.value(1).toString();
         inputTuneTo[inputNum]     = query.value(2).toString();
         inputChannel[inputNum]    = query.value(3).toString();
+        sourceid[inputNum]        = query.value(4).toString();
     }
 
     // print em

libs/libmythtv/eithelper.cpp

@@ -62 +62 @@
 /** \fn EITHelper::ProcessEvents(int)
  *  \brief Inserts events in EIT list.
  *
- *  NOTE: This currently takes a mplexid key for the dtv_multiplex table,
- *        but it should just take a sourceid key for the channel table.
- *
  *  \param mplexid multiplex we are inserting events for.
  *  \return Returns number of events inserted into DB.
  */
-uint EITHelper::ProcessEvents(int mplexid)
+uint EITHelper::ProcessEvents(int srcid)
 {
     QMutexLocker locker(&eitList_lock);
 
@@ -82 +79 @@
         eitList.pop_front();
 
         eitList_lock.unlock();
-        insertCount += UpdateEITList(mplexid, *events);
+        insertCount += UpdateEITList(srcid, *events);
         QList_Events::iterator it = events->begin();
         for (; it != events->end(); ++it)
             delete *it;
@@ -100 +97 @@
         events->erase(events->begin(), subset_end);
         
         eitList_lock.unlock();
-        insertCount += UpdateEITList(mplexid, subset);
+        insertCount += UpdateEITList(srcid, subset);
         QList_Events::iterator it = subset.begin();
         for (; it != subset.end(); ++it)
             delete *it;
@@ -115 +112 @@
     return insertCount;
 }
 
-int EITHelper::GetChanID(int mplexid, const Event &event) const
+int EITHelper::GetChanID(int srcid, const Event &event) const
 {
     unsigned long long srv = event.ServiceID;
-    srv |= ((unsigned long long) event.TransportID) << 32;
-    srv |= (event.ATSC) ? (mplexid << 16) : (event.NetworkID << 16);
+    srv |= ((unsigned long long) event.TransportID) << 48;
+    srv |= srcid << 32;
+    srv |= event.NetworkID << 16;
 
     int chanid = srv_to_chanid[srv];
     if (chanid == 0)
-        srv_to_chanid[srv] = chanid = get_chan_id_from_db(mplexid, event);
+        srv_to_chanid[srv] = chanid = get_chan_id_from_db(srcid, event);
     return chanid;
 }
 
-uint EITHelper::UpdateEITList(int mplexid, const QList_Events &events)
+uint EITHelper::UpdateEITList(int srcid, const QList_Events &events)
 {
     MSqlQuery query1(MSqlQuery::InitCon());
     MSqlQuery query2(MSqlQuery::InitCon());
@@ -137 +135 @@
 
     QList_Events::const_iterator e = events.begin();
     for (; e != events.end(); ++e)
-        if ((chanid = GetChanID(mplexid, **e)) > 0)
+        if ((chanid = GetChanID(srcid, **e)) > 0)
             counter += update_eit_in_db(query1, query2, chanid, **e);
 
     return counter;
 }
 
-static int get_chan_id_from_db(int mplexid, const Event &event)
+static int get_chan_id_from_db(int srcid, const Event &event)
 {
     MSqlQuery query(MSqlQuery::InitCon());
     // Now figure out the chanid for this
@@ -153 +151 @@
     if (event.ATSC)
     {
         query.prepare(QString("SELECT chanid, useonairguide FROM channel "
-                              "WHERE atscsrcid = %1 AND mplexid = %2")
+                              "WHERE atscsrcid = %1 AND sourceid = %2")
                       .arg(event.ServiceID)
-                      .arg(mplexid));
+                      .arg(srcid));
     }
     else
     {
@@ -165 +163 @@
                               "WHERE serviceid = %1 AND "
                               "      networkid = %2 AND "
                               "      transportid = %3 AND "
+                              "      channel.sourceid = %4 AND "
                               "      channel.mplexid = dtv_multiplex.mplexid")
                       .arg(event.ServiceID)
                       .arg(event.NetworkID)
-                      .arg(event.TransportID));
+                      .arg(event.TransportID)
+                      .arg(srcid));
     }
 
     if (!query.exec() || !query.isActive())
@@ -177 +177 @@
     if (query.size() <= 0)
     {
         VERBOSE(VB_EIT, QString(
-                    "EITHelper: chanid not found for atscsrcid = %1 "
-                    "and mplexid = %2, \n\t\t\tso event updates were skipped.")
-            .arg(event.ServiceID).arg(mplexid));
+                    "EITHelper: chanid not found for service %1 "
+                    "on source %2, \n\t\t\tso event updates were skipped.")
+            .arg(event.ServiceID).arg(srcid));
         return -1;
     }
 

libs/libmythtv/eitscanner.cpp

@@ -91 +91 @@
     {
         if (channel)
         {
-            int mplex = channel->GetMultiplexID();
-            if ((mplex > 0) && parser && eitHelper->GetListSize())
+            int srcid = channel->GetCurrentSourceID();
+            if ((srcid > 0) && parser && eitHelper->GetListSize())
             {
-                eitCount += eitHelper->ProcessEvents(mplex);
+                eitCount += eitHelper->ProcessEvents(srcid);
                 t.start();
             }
         }

libs/libmythtv/channelbase.h

@@ -60 +60 @@
         { return currentcapchannel; }
     virtual QString GetCurrentInput(void) const
         { return channelnames[GetCurrentInputNum()]; }
+    virtual int GetCurrentSourceID(void) const
+        { return sourceid[GetCurrentInputNum()].toInt(); }
     virtual QString GetOrdering(void) const
         { return channelorder; }
     /// \brief Returns true iff commercial detection is not required