Ticket #8483: backport-changeset_r24121.2.diff

libs/libmythtv/eitfixup.cpp

@@ -103 +103 @@
       m_nlYear2("([\\s]{1}[\\(]{1}[A-Z]{0,3}/?)([1-2]{2}[0-9]{2})([\\)]{1})"),
       m_nlDirector("(?=\\svan\\s)(([A-Z]{1}[a-z]+\\s)|([A-Z]{1}\\.\\s))"),
       m_nlCat("^(Amusement|Muziek|Informatief|Nieuws/actualiteiten|Jeugd|Animatie|Sport|Serie/soap|Kunst/Cultuur|Documentaire|Film|Natuur|Erotiek|Comedy|Misdaad|Religieus)\\.\\s"),
-      m_nlOmroep ("\\s\\(([A-Z]+/?)+\\)$")
+      m_nlOmroep ("\\s\\(([A-Z]+/?)+\\)$"),
+      m_noRerun(" \\(R\\)")
 
 {
 }
@@ -155 +156 @@
     if (kFixNL & event.fixup)
         FixNL(event);
 
+    if (kFixNO & event.fixup)
+        FixNO(event);
+
     if (event.fixup)
     {
         if (!event.title.isEmpty())
@@ -1483 +1487 @@
     event.subtitle    = event.subtitle.trimmed();
 
 }
+
+/** \fn EITFixUp::FixNO(DBEventEIT&) const
+ *  \brief Use this to clean DVB-S guide in Norway.
+ */
+void EITFixUp::FixNO(DBEventEIT &event) const
+{
+    // Check for "title (R)" in the title
+    int position = event.title.indexOf(m_noRerun);
+    if (position != -1)
+    {
+      event.previouslyshown = true;
+      event.title = event.title.replace(m_noRerun, "");
+    }
+}
+

libs/libmythtv/eithelper.cpp

@@ -773 +773 @@
         fix[    15U << 16] = // DVB-C Welho
         EITFixUp::kFixFI;
 
+    // DVB-S(2) Thor 0.8W Norwegian
+    fix[70U << 16] = EITFixUp::kFixNO;
+
     ///////////////////////////////////////////////////////////////////////////
     // Special Early fixups for providers that break DVB EIT spec.
     // transport_id<<32 | netword_id<<16 | service_id

libs/libmythtv/eitfixup.h

@@ -45 +45 @@
         kFixPremiere   = 0x0400,
         kFixHDTV       = 0x0800,
         kFixNL         = 0x1000,
+        kFixNO         = 0x10000,
 
         // Early fixups
         kEFixForceISO8859_1  = 0x2000,
@@ -81 +82 @@
     void FixFI(DBEventEIT &event) const;            // Finland DVB-T
     void FixPremiere(DBEventEIT &event) const;      // german pay-tv Premiere
     void FixNL(DBEventEIT &event) const;            // Netherlands DVB-C
+    void FixNO(DBEventEIT &event) const;            // Norwegian DVB-S
 
     static QString AddDVBEITAuthority(uint chanid, const QString &id);
 
@@ -170 +172 @@
     const QRegExp m_nlDirector;
     const QRegExp m_nlCat;
     const QRegExp m_nlOmroep;
+    const QRegExp m_noRerun;
 };
 
 #endif // EITFIXUP_H