Ticket #5922: myth-eitfix-fi-netwid-fixed.patch

libs/libmythtv/eitfixup.cpp

@@ -79 +79 @@
       m_RTLSubtitle5("^'(.+)'\\.\\s*"),
       m_RTLEpisodeNo1("^(Folge\\s\\d{1,4})\\.*\\s*"),
       m_RTLEpisodeNo2("^(\\d{1,2}\\/[IVX]+)\\.*\\s*"),
-      m_fiRerun("Uusinta.?"),
+      m_fiRerun("Uusinta[a-zA-Z\\ ]*\\.?"),
+      m_fiRerun2("\\([Uu]\\)"),
       m_Stereo("(Stereo)"),
       m_dePremiereInfos("([^.]+)?\\s?([0-9]{4})\\.\\s[0-9]+\\sMin\\.(?:\\sVon"
                         "\\s([^,]+)(?:,|\\su\\.\\sa\\.)\\smit\\s(.+)\\.)?"),
@@ -1119 +1120 @@
         event.description = event.description.replace(m_fiRerun, "");
     }
 
+    position = event.description.find(m_fiRerun2);
+    if (position != -1)
+    {
+        event.previouslyshown = true;
+        event.description = event.description.replace(m_fiRerun2, "");
+    }
+
     // Check for (Stereo) in the decription and set the <audio> tags
     position = event.description.find(m_Stereo);
     if (position != -1)

libs/libmythtv/eithelper.cpp

@@ -847 +847 @@
         fix[ 1094LL << 32 | 1 << 16 | 17028 ] = // NT1
         fix[ 1100LL << 32 | 1 << 16 |  8710 ] = // NRJ 12
         EITFixUp::kEFixForceISO8859_15;
+
+    // DVB-T Espoo, Finland
+    fix[ 8438U << 16] = EITFixUp::kFixFI;
+
+    // DVB-C Welho Finland
+    fix[ 42249U << 16] = EITFixUp::kFixFI;
+    fix[ 15U << 16] = EITFixUp::kFixFI;
 }
 
 static int calc_eit_utc_offset(void)

libs/libmythtv/eitfixup.h

@@ -144 +144 @@
     const QRegExp m_RTLEpisodeNo1;
     const QRegExp m_RTLEpisodeNo2;
     const QRegExp m_fiRerun;
+    const QRegExp m_fiRerun2;
     const QRegExp m_Stereo;
     const QRegExp m_dePremiereInfos;
     const QRegExp m_dePremiereOTitle;