Ticket #2528: 2528_setupDTVSigmon_by_SIstandard_DVB_v2.diff

mythtv/libs/libmythtv/dbcheck.cpp

@@ -10 +10 @@
 #include "mythdbcon.h"
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1168";
+const QString currentDatabaseVersion = "1169";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -2669 +2669 @@
         if (!performActualUpdate(updates, "1168", dbver))
             return false;
     }
+
+    if (dbver == "1168")
+    {
+        const QString updates[] = {
+"UPDATE dtv_multiplex SET sistandard='mpeg', networkid=NULL, transportid=NULL "
+"WHERE sistandard = 'dvb' AND networkid IS NULL OR networkid < 1;",
+""
+};
+
+        if (!performActualUpdate(updates, "1169", dbver))
+            return false;
+    }
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22
 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22
 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22

mythtv/libs/libmythtv/tv_rec.cpp

@@ -1666 +1666 @@
     bool fta = CardUtil::IgnoreEncrypted(
         GetCaptureCardNum(), channel->GetCurrentInput());
 
+    QString sistandard = dtvchan->GetSIStandard();
+
     // Check if this is an ATSC Channel
     int major = dtvchan->GetMajorChannel();
     int minor = dtvchan->GetMinorChannel();
@@ -1701 +1703 @@
     // Check if this is an DVB channel
     int progNum = dtvchan->GetProgramNumber();
 #ifdef USING_DVB
-    int netid   = dtvchan->GetOriginalNetworkID();
-    int tsid    = dtvchan->GetTransportID();
-    if (netid > 0 && tsid > 0 && progNum >= 0)
+    if (progNum >= 0 && sistandard == "dvb")
     {
+        int netid   = dtvchan->GetOriginalNetworkID();
+        int tsid    = dtvchan->GetTransportID();
+
         uint neededVideo = 0;
         uint neededAudio = 0;