Merge branch 'fixes/0.24' of github.com:MythTV/mythtv into jyavenard/backports/fixes/0.24

Author: jyavenard

mythtv/libs/libmythtv/eitfixup.cpp

@@ -55,6 +55,7 @@ EITFixUp::EITFixUp()
       m_ukYearColon("^[\\d]{4}:"),
       m_ukExclusionFromSubtitle("(starring|stars\\s|drama|series|sitcom)",Qt::CaseInsensitive),
       m_ukCompleteDots("^\\.\\.+$"),
+      m_ukAllNew("All New To 4Music!\\s?"),
       m_comHemCountry("^(\\(.+\\))?\\s?([^ ]+)\\s([^\\.0-9]+)"
                       "(?:\\sfrån\\s([0-9]{4}))(?:\\smed\\s([^\\.]+))?\\.?"),
       m_comHemDirector("[Rr]egi"),
@@ -680,6 +681,9 @@ void EITFixUp::FixUK(DBEventEIT &event) const
     // BBC 7 [Rpt of ...] case.
     event.description = event.description.remove(m_ukBBC7rpt);
 
+    // "All New To 4Music!
+    event.description = event.description.remove(m_ukAllNew);
+
     // Remove [AD,S] etc.
     QRegExp tmpCC = m_ukCC;
     if ((position1 = tmpCC.indexIn(event.description)) != -1)

mythtv/libs/libmythtv/eitfixup.h

@@ -134,6 +134,7 @@ class EITFixUp
     const QRegExp m_ukYearColon;
     const QRegExp m_ukExclusionFromSubtitle;
     const QRegExp m_ukCompleteDots;
+    const QRegExp m_ukAllNew;
     const QRegExp m_comHemCountry;
     const QRegExp m_comHemDirector;
     const QRegExp m_comHemActor;

mythtv/libs/libmythtv/nuppeldecoder.cpp

@@ -1124,7 +1124,8 @@ bool NuppelDecoder::GetFrame(DecodeType decodetype)
             else if (frameheader.comptype == 'V')
             {
                 lastKey = frameheader.timecode;
-                framesPlayed = frameheader.timecode - 1;
+                framesPlayed = (frameheader.timecode > 0 ?
+                                frameheader.timecode - 1 : 0);
 
                 if (!hasFullPositionMap)
                 {