Ticket #8501: channelutil.cpp.diff

channelutil.cpp

@@ -28 +28 @@
                               uint     transport_id,
                               // tsid exists with other sistandards,
                               // but we only trust it in dvb-land.
-                              uint     network_id)
+                              uint     network_id,
+                              // must check polarity for dvb-s
+                              signed char polarity)
 {
+        VERBOSE(VB_CHANSCAN, QString(
+                    "get_dtv_multiplex(db_source_id: %1, sistandard: '%2', "
+                                "frequency: %3, transport_id: %4, network_id: %5, polarity: %6)")
+                    .arg(db_source_id).arg(sistandard)
+                    .arg(frequency).arg(transport_id)
+                    .arg(network_id).arg(polarity));
+
     QString qstr =
         "SELECT mplexid "
         "FROM dtv_multiplex "
@@ -44 +53 @@
         qstr += "AND networkid    = :NETWORKID   ";
     }
 
+    // REMOVE THIS COMMENT: When using my Twinhan AD-SP400 (DVB-S2) using the alpha
+    // mantis driver with channels.conf scanning, it scans as "not dvb" mode even
+    // though it's a DVB card (i.e. sistandard is a blank string) so I've made
+    // it always check polarity if it's >0
+    //
+    // I'm not sure why an unsigned char is used for polarity, but I thought I'd
+    // better add checks if it's ever <0 - remove/modify if it's never <0!
+    if (polarity>0)
+        qstr += "AND polarity     = :POLARITY    ";
+
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(qstr);
 
@@ -51 +70 @@
     query.bindValue(":SISTANDARD",        sistandard);
 
     if (sistandard.toLower() != "dvb")
-        query.bindValue(":FREQUENCY", QString::number(frequency));
+        query.bindValue(":FREQUENCY",   QString::number(frequency));
     else
     {
-        query.bindValue(":TRANSPORTID",   transport_id);
-        query.bindValue(":NETWORKID",     network_id);
+        query.bindValue(":TRANSPORTID", transport_id);
+        query.bindValue(":NETWORKID",   network_id);
     }
 
+        // REMOVE THIS COMMENT: polarity needs to be converted to a string as passing
+    // a signed char will mean the integer is passed to the SQL query :-)
+    if (polarity>0)
+                query.bindValue(":POLARITY",    QString(polarity));
+
     if (!query.exec() || !query.isActive())
     {
         MythDB::DBError("get_dtv_multiplex", query);
@@ -89 +113 @@
     uint mplex = get_dtv_multiplex(
         db_source_id,  sistandard,    frequency,
         // DVB specific
-        transport_id,  network_id);
+        transport_id,  network_id, polarity);
 
     VERBOSE(VB_CHANSCAN, QString(
-                "insert_dtv_multiplex(%1, '%2', %3, %4, %5, %6...) mplexid:%7")
+                "insert_dtv_multiplex(db_source_id: %1, sistandard: '%2', "
+                                "frequency: %3, modulation: %4, transport_id: %5, "
+                                "network_id: %6, polarity: %7...) mplexid:%8")
             .arg(db_source_id).arg(sistandard)
             .arg(frequency).arg(modulation)
             .arg(transport_id).arg(network_id)
-            .arg(mplex));
+            .arg(polarity).arg(mplex));
 
     bool isDVB = (sistandard.toLower() == "dvb");
 
@@ -141 +167 @@
         "WHERE sourceid    = :SOURCEID      AND "
         "      sistandard  = :SISTANDARD    AND ";
 
+    // After inserting the channels, it UPDATEs ALL the items and replaces
+    // the polarity of both v and h DVB-S transponders with the new value
+    // without this line!
+    // HACK: I used :WHEREPOLARITY to prevent :POLARITY overtaking :POLARITY2
+    if (polarity > 0)
+        updateStr += " polarity     = :WHEREPOLARITY      AND ";
+
     updateStr += (isDVB) ?
         " transportid = :TRANSPORTID AND networkid = :NETWORKID " :
         " frequency = :FREQUENCY2 ";
@@ -211 +244 @@
             if (transport_id)
                 query.bindValue(":TRANSPORTID", transport_id);
         }
+
+        if (polarity > 0)
+                query.bindValue(":WHEREPOLARITY", QString("%1").arg((char)polarity));
     }
     else
     {
@@ -263 +299 @@
     mplex = get_dtv_multiplex(
         db_source_id,  sistandard,    frequency,
         // DVB specific
-        transport_id,  network_id);
+        transport_id,  network_id, polarity);
 
     VERBOSE(VB_CHANSCAN, QString("insert_dtv_multiplex -- ") +
             QString("inserted %1").arg(mplex));