Ticket #7486: mythtv_fix_broken_providers_with_gui.diff

libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -174 +174 @@
     {
         VERBOSE(VB_CHANSCAN, LOC + "Connecting up DTVSignalMonitor");
         ScanStreamData *data = new ScanStreamData();
+        
+        MSqlQuery query(MSqlQuery::InitCon());
+        query.prepare(
+                "SELECT dvb_nit_id "
+                "FROM videosource "
+                "WHERE videosource.sourceid = :SOURCEID");
+        query.bindValue(":SOURCEID", _sourceID);
+        if (!query.exec() || !query.isActive())
+        {
+            MythDB::DBError("ChannelScanSM", query);
+        }
+        else if (query.next())
+        {
+            uint nitid = query.value(0).toInt(); 
+            data->SetRealNetworkID(nitid);
+            VERBOSE(VB_CHANSCAN, LOC + QString("Setting NIT-ID to %1").arg(nitid)); 
+        }
 
         dtvSigMon->SetStreamData(data);
         dtvSigMon->AddFlags(SignalMonitor::kDTVSigMon_WaitForMGT |

libs/libmythtv/dbcheck.cpp

@@ -20 +20 @@
 /// This is the DB schema version expected by the running MythTV instance.
 const QString currentDatabaseVersion = "1244";
 
+static bool UpgradeDBSchemaInFixes(void);
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(
     const char **updates, const char *version, QString &dbver);
@@ -469 +470 @@
     // There may be a race condition where another program (e.g. mythbackend)
     // is upgrading, so wait up to 5 seconds for a more accurate version:
     DBup->CompareAndWait(5);
+    
+    if (!gContext->GetNumSetting("have-nit-fix", 0))
+    {
+        UpgradeDBSchemaInFixes();
+    }
 
-    if (DBup->versionsBehind == 0)  // same schema
+    if (DBup->versionsBehind == 0 &&
+        gContext->GetNumSetting("have-nit-fix", 0))  // same schema
     {
         gContext->ActivateSettingsCache(true);
         GetMythDB()->SetSuppressDBMessages(false);
@@ -4922 +4929 @@
     return true;
 }
 
+static bool UpgradeDBSchemaInFixes()
+{
+    QString dbver = gContext->GetSetting("DBSchemaVer");
+
+    if (!gContext->GetNumSetting("have-nit-fix", 0))
+    {
+        const char *updates[] = {
+"ALTER TABLE videosource ADD dvb_nit_id INT(6) DEFAULT -1;",
+NULL
+        };
+
+        if (!performActualUpdate(updates, "1244", dbver))
+            return false;
+ 
+        gContext->SaveSetting("have-nit-fix", 1);
+    }
+
+    return true;
+}
+
 /**
  * command to get the the initial database layout from an empty database:
  *

libs/libmythtv/mpeg/dvbtables.cpp

@@ -79 +79 @@
     return _cached_network_name;
 }
 
+bool NetworkInformationTable::Mutate(void)
+{
+    if (VerifyCRC())
+    {
+        SetTableID((TableID() == TableID::NITo) ? TableID::NIT : TableID::NITo);
+        SetCRC(CalcCRC());
+        return true;
+    }
+    else
+        return false;
+}
 
 void ServiceDescriptionTable::Parse(void) const
 {

libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -234 +234 @@
     {
         case TableID::NIT:
         {
+            if (_dvb_real_network_id >= 0 && psip.TableIDExtension() != (uint)_dvb_real_network_id)
+            {
+                NetworkInformationTable *nit = new NetworkInformationTable(psip);
+                if (!nit->Mutate())
+                {
+                    delete nit;
+                    return true;
+                }
+                bool retval = HandleTables(pid, *nit);
+                delete nit;
+                return retval;
+            }
+
             SetVersionNIT(psip.Version(), psip.LastSection());
             SetNITSectionSeen(psip.Section());
 
@@ -291 +304 @@
         }
         case TableID::NITo:
         {
+            if (_dvb_real_network_id >= 0 && psip.TableIDExtension() == (uint)_dvb_real_network_id)
+            {
+                NetworkInformationTable *nit = new NetworkInformationTable(psip);
+                if (!nit->Mutate())
+                {
+                    delete nit;
+                    return true;
+                }
+                bool retval = HandleTables(pid, *nit);
+                delete nit;
+                return retval;
+            }
+
             SetVersionNITo(psip.Version(), psip.LastSection());
             SetNIToSectionSeen(psip.Section());
             NetworkInformationTable nit(psip);

libs/libmythtv/mpeg/dvbtables.h

@@ -79 +79 @@
         { return _ptrs[i]+6; }
     // }
 
+    /// mutates a NITo into a NITa (vice versa) and recalculates the CRC
+    bool Mutate(void);
+
     void Parse(void) const;
     QString toString(void) const;
     QString NetworkName(void) const;
@@ -154 +157 @@
     // }
     ServiceDescriptor *GetServiceDescriptor(uint i) const;
 
-    /// mutates a SDTo into a SDTa and recalculates the CRC
+    /// mutates a SDTo into a SDTa (vice versa) and recalculates the CRC
     bool Mutate(void);
 
     void Parse(void) const;

libs/libmythtv/mpeg/dvbstreamdata.h

@@ -40 +40 @@
     bool IsRedundant(uint pid, const PSIPTable&) const;
     void ProcessSDT(uint tsid, const ServiceDescriptionTable*);
 
+    // NIT for broken providers
+    inline void SetRealNetworkID(int);
+
     // EIT info/processing
     inline void SetDishNetEIT(bool);
     inline bool HasAnyEIT(void) const;
@@ -212 +215 @@
     uint                      _desired_netid;
     uint                      _desired_tsid;
     
+    // Real network ID for broken providers
+    int               _dvb_real_network_id;
+    
     /// Decode DishNet's long-term DVB EIT
     bool                      _dvb_eit_dishnet_long;
     /// Tell us if the DVB service has EIT
@@ -251 +257 @@
     _dvb_eit_dishnet_long = use_dishnet_eit;
 }
 
+inline void DVBStreamData::SetRealNetworkID(int real_network_id)
+{
+    QMutexLocker locker(&_listener_lock);
+    _dvb_real_network_id = real_network_id;
+}
+
 inline bool DVBStreamData::HasAnyEIT(void) const
 {
     QMutexLocker locker(&_listener_lock);

libs/libmythtv/videosource.cpp

@@ -197 +197 @@
     };
 };
 
+class DVBNetID : public SpinBoxSetting, public VideoSourceDBStorage
+{
+  public:
+    DVBNetID(const VideoSource &parent, uint value, signed int min_val) :
+        SpinBoxSetting(this, min_val, 100000, 1),
+        VideoSourceDBStorage(this, parent, "dvb_nit_id")
+    {
+        setLabel(QObject::tr("Network ID"));
+        setHelpText(QObject::tr("Set this to the actual network ID at your "
+                 "location, if you have a provider that broadcasts a broken "
+                 "NIT. Leave at -1 if everything works out of the box."));
+    };
+};
+
 FreqTableSelector::FreqTableSelector(const VideoSource &parent) :
     ComboBoxSetting(this), VideoSourceDBStorage(this, parent, "freqtable")
 {
@@ -749 +763 @@
     group->addChild(name = new Name(*this));
     group->addChild(xmltv = new XMLTVConfig(*this));
     group->addChild(new FreqTableSelector(*this));
+    group->addChild(new DVBNetID(*this, -1, -1));
     addChild(group);
 }