Ticket #5530: csat-eithelper.diff

mythtv/libs/libmythtv/eithelper.h

@@ -48 +48 @@
 class ExtendedTextTable;
 class DVBEventInformationTable;
 class PremiereContentInformationTable;
+class CSatCaraibesInformationTable;
 
 class EITHelper
 {
@@ -72 +73 @@
                     const ExtendedTextTable     *ett);
         void AddEIT(const DVBEventInformationTable *eit);
         void AddEIT(const PremiereContentInformationTable *eit);
+        void AddEIT(CSatCaraibesInformationTable *eit);
 #else // if !USING_BACKEND
         void AddEIT(uint, uint, const EventInformationTable*) {}
         void AddETT(uint, uint, const ExtendedTextTable*) {}
         void AddEIT(const DVBEventInformationTable*) {}
         void AddEIT(const PremiereContentInformationTable*) {}
+        void AddEIT(const CSatCaraibesInformationTable*) {}
 #endif // !USING_BACKEND
 
         // EIT cache handling

mythtv/libs/libmythtv/eithelper.cpp

@@ -19 +19 @@
 #include "atsctables.h"
 #include "dvbtables.h"
 #include "premieretables.h"
+#include "csatcaraibestables.h"
 #include "dishdescriptors.h"
 #include "premieredescriptors.h"
 #include "util.h"
@@ -511 +512 @@
     }
 }
 
+// This function gets special eit data from the French provider
+// Canal Satellite Caraibes. It probably applies to this provider
+// in France. This EIT is available for all channels for 7-10 days                   
+void EITHelper::AddEIT(CSatCaraibesInformationTable *cit)
+{
+    QString title         = QString::null;
+    QString subtitle      = QString::null;
+    QString description   = QString::null;
+    QString category      = QString::null;
+    MythCategoryType category_type = kCategoryNone;
+    unsigned char subtitle_type=0, audio_props=0, video_props=0;
+    uint fix = fixup[ 601LL << 32 | 1 << 16 |  0 ] | EITFixUp::kFixGenericDVB;
+    if (!cit->IsReady()) {
+        VERBOSE(VB_EIT,LOC+"CSAT EIT NOT READY YET");
+        return;
+    }
+    for (uint i = 0;i < cit->NbSchedules();i++) {
+        const CSatCaraibesSchedule& schedule = cit->GetSchedule(i);
+        QString title = schedule.title;
+        const vector<CSatCaraibesShowing>& showings = schedule.showings;
+        QMap<uint, QString>::const_iterator sum;
+        bool sum_available = false;
+
+        if (schedule.key) {
+            /* If the summary is not there we go on with the next schedule */
+            if (!(cit->GetSummary(i, sum))) continue;
+            sum_available = true;
+        }
+        for (vector<CSatCaraibesShowing>::const_iterator it = showings.begin();
+             it != showings.end();it++) {
+            QDateTime starttime = (*it).Start;
+            //    EITFixUp::TimeFix(starttime);
+            QDateTime endtime   = starttime.addSecs(schedule.duration*60);
+            uint chanid;
+            DBEvent *event;
+            const CSatCaraibesChannelInfo& info = cit->GetChannelInfoFromIndex((*it).channel_index);
+            chanid = GetChanID(info.tsid,info.serviceid,info.orignetworkid);
+            VERBOSE(VB_EIT, LOC +
+                    QString("CSATCARAIBES EIT for NIT %1, TID %2, SID %3, "
+                            "T: %4, Start: %5, Dur: %6 Thm: %7, summ: %8")
+                    .arg(info.orignetworkid).arg(info.tsid).arg(info.serviceid)
+                    .arg(title).arg(starttime.toString()).arg(schedule.duration)
+                    .arg(schedule.theme).arg((sum_available ? *sum :"No summary")));
+      
+            if (!chanid)
+            {
+                VERBOSE(VB_EIT, LOC +
+                        QString("CSATCARAIBES EIT for NIT %1, TID %2, SID %3, "
+                                "title: %4. Channel not found!")
+                        .arg(info.orignetworkid).arg(info.tsid).arg(info.serviceid)
+                        .arg(title));
+                continue;
+            }
+      
+            /*      event = new DBEvent(chanid,
+                    title, QString::null, sum_available ? (*sum).value():"",
+                    category,  category_type,
+                    starttime, endtime, fix,
+                    subtitle_type,
+                    audio_props,
+                    video_props,
+                    "",  "");
+                    db_events.enqueue(event);*/
+        }
+    }
+}
 
 void EITHelper::PruneEITCache(uint timestamp)
 {
@@ -855 +908 @@
         fix[ 1100LL << 32 | 1 << 16 |  8710 ] = // NRJ 12
         EITFixUp::kEFixForceISO8859_15;
 
+    // IntelSat 903 DVB-S french channels (CanalSat Caraibes)
+    // The original network id is the same as the previous one
+    // at least transport ids are different
+    // For now all channels are marked as needing fixup
+    fix[   601LL << 32 | 1 << 16 |  0 ] =
+        fix[ 602LL << 32 | 1 << 16 |  0 ] =
+        fix[ 603LL << 32 | 1 << 16 |  0 ] =
+        fix[ 604LL << 32 | 1 << 16 |  0 ] =
+        EITFixUp::kEFixForceISO8859_15;
 }
 
 static int calc_eit_utc_offset(void)