Ticket #5072: configureable_iso8859_15_fix.diff

libs/libmythtv/eithelper.cpp

@@ -27 +27 @@
 static uint get_chan_id_from_db(uint sourceid,
                                 uint atscmajor, uint atscminor);
 static uint get_chan_id_from_db(uint sourceid,  uint serviceid,
-                                uint networkid, uint transportid);
+                                uint networkid, uint transportid,
+                                bool &forceisofix);
 static void init_fixup(QMap<uint64_t,uint> &fix);
 static int calc_eit_utc_offset(void);
 
@@ -122 +123 @@
     fixup[atsc_key] = eitfixup;
 }
 
+void EITHelper::SetFixup(uint transportid, uint networkid, uint serviceid, uint eitfixup)
+{
+    QMutexLocker locker(&eitList_lock);
+    uint64_t dvb_key = ((uint64_t) transportid << 32) | ((uint64_t) networkid << 16) | (uint64_t) serviceid;
+    fixup[dvb_key] |= eitfixup;
+}
+
 void EITHelper::SetLanguagePreferences(const QStringList &langPref)
 {
     QMutexLocker locker(&eitList_lock);
@@ -302 +310 @@
     fix |= fixup[(((uint64_t)eit->TSID()) << 32) |
                  (eit->OriginalNetworkID() << 16)];
     fix |= fixup[(eit->OriginalNetworkID() << 16) | eit->ServiceID()];
-    fix |= fixup[(((uint64_t)eit->TSID()) << 32) |
-                 (uint64_t)(eit->OriginalNetworkID() << 16) |
-                 (uint64_t)eit->ServiceID()];
     fix |= EITFixUp::kFixGenericDVB;
 
     uint chanid = GetChanID(eit->ServiceID(), eit->OriginalNetworkID(),
                             eit->TSID());
+
+    fix |= fixup[(((uint64_t)eit->TSID()) << 32) |
+                 (uint64_t)(eit->OriginalNetworkID() << 16) |
+                 (uint64_t)eit->ServiceID()];
+
     if (!chanid)
         return;
 
@@ -474 +484 @@
 
         uint chanid = GetChanID(serviceid, networkid, tsid);
 
+        fix |= fixup[(((uint64_t)tsid << 32) |
+                       ((uint64_t)networkid) << 16) |
+                       ((uint64_t)serviceid))]; 
+
         if (!chanid)
         {
             VERBOSE(VB_EIT, LOC +
@@ -599 +613 @@
     if (it != srv_to_chanid.end())
         return max(*it, 0);
 
-    uint chanid = get_chan_id_from_db(sourceid, serviceid, networkid, tsid);
+    bool forceisofix = 0;
+    uint chanid = get_chan_id_from_db(sourceid, serviceid, networkid, tsid, forceisofix);
     if (chanid)
+    {
+        if(forceisofix)
+            SetFixup(tsid, networkid, serviceid, EITFixUp::kEFixForceISO8859_15);
+
         srv_to_chanid[key] = chanid;
+    }
 
     return chanid;
 }
@@ -611 +631 @@
 {
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(
-            "SELECT chanid, useonairguide "
+            "SELECT chanid, useonairguide, forceiso8859_15 "
             "FROM channel "
             "WHERE atsc_major_chan = :MAJORCHAN AND "
             "      atsc_minor_chan = :MINORCHAN AND "
@@ -633 +653 @@
 
 // Figure out the chanid for this channel
 static uint get_chan_id_from_db(uint sourceid, uint serviceid,
-                                uint networkid, uint transportid)
+                                uint networkid, uint transportid,bool &forceisofix)
 {
     MSqlQuery query(MSqlQuery::InitCon());
 
     // DVB Link to chanid
     QString qstr =
-        "SELECT chanid, useonairguide "
+        "SELECT chanid, useonairguide, forceiso8859_15 "
         "FROM channel, dtv_multiplex "
         "WHERE serviceid        = :SERVICEID   AND "
         "      networkid        = :NETWORKID   AND "
@@ -661 +681 @@
         MythContext::DBError("Looking up chanID", query);
     else if (query.next())
     {
+        forceisofix=query.value(2).toBool();
         // Check to see if we are interseted in this channel
         bool useOnAirGuide = query.value(1).toBool();
         return (useOnAirGuide) ? query.value(0).toUInt() : 0;

libs/libmythtv/eithelper.h

@@ -62 +62 @@
 
     void SetGPSOffset(uint _gps_offset) { gps_offset = 0 - _gps_offset; }
     void SetFixup(uint atsc_major, uint atsc_minor, uint eitfixup);
+    void SetFixup(uint transportid, uint networkid, uint serviceid, uint eitfixup);
     void SetLanguagePreferences(const QStringList &langPref);
     void SetSourceID(uint _sourceid);