summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Auchterlonie <stuarta@squashedfrog.net>2011-11-16 22:23:16 (GMT)
committer Stuart Auchterlonie <stuarta@squashedfrog.net>2011-11-16 22:23:16 (GMT)
commit9f9dcf5ba55133c7f48c58eed7e0db8feaeb950a (patch)
tree1e3e315d04c8caba1813ab98c634ee2eb1dbe867
parente16613a3cae2347410b77aad6abcc11096fb749a (diff)
Add a UK fixup to remove "All New To 4Music!" which is breaking
proper creation of subtitles and therefore duplicate matching.
-rw-r--r--mythtv/libs/libmythtv/eitfixup.cpp4
-rw-r--r--mythtv/libs/libmythtv/eitfixup.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp
index cd4c300..5a7af12 100644
--- a/mythtv/libs/libmythtv/eitfixup.cpp
+++ b/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)
diff --git a/mythtv/libs/libmythtv/eitfixup.h b/mythtv/libs/libmythtv/eitfixup.h
index d4e9cf8..2ea8d6b 100644
--- a/mythtv/libs/libmythtv/eitfixup.h
+++ b/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;