diff --git a/mythtv/libs/libmythtv/eitfixup.cpp b/mythtv/libs/libmythtv/eitfixup.cpp
index 8148018..5134328 100644
a
|
b
|
EITFixUp::EITFixUp() |
105 | 105 | m_nlRepeat("herh."), |
106 | 106 | m_nlHD("\\sHD$"), |
107 | 107 | m_nlSub("\\sAfl\\.:\\s([^\\.]+)\\."), |
| 108 | m_nlSub2("\\s\"([^\"]+)\""), |
108 | 109 | m_nlActors("\\sMet:\\s.+e\\.a\\."), |
109 | 110 | m_nlPres("\\sPresentatie:\\s([^\\.]+)\\."), |
110 | 111 | m_nlPersSeparator("(, |\\sen\\s)"), |
… |
… |
void EITFixUp::FixNL(DBEventEIT &event) const |
1542 | 1543 | event.categoryType = kCategoryNone; |
1543 | 1544 | } |
1544 | 1545 | |
| 1546 | // Film - categories are usually not Films |
| 1547 | if (event.category.startsWith("Film -")) |
| 1548 | { |
| 1549 | event.categoryType = kCategorySeries; |
| 1550 | } |
| 1551 | |
1545 | 1552 | // Get stereo info |
1546 | 1553 | int position; |
1547 | 1554 | if ((position = fullinfo.indexOf(m_Stereo)) != -1) |
… |
… |
void EITFixUp::FixNL(DBEventEIT &event) const |
1576 | 1583 | event.title = event.title.replace(m_nlHD, ""); |
1577 | 1584 | } |
1578 | 1585 | |
1579 | | // Try to make subtitle |
| 1586 | // Try to make subtitle from Afl.: |
1580 | 1587 | QRegExp tmpSub = m_nlSub; |
1581 | 1588 | QString tmpSubString; |
1582 | 1589 | if (tmpSub.indexIn(fullinfo) != -1) |
… |
… |
void EITFixUp::FixNL(DBEventEIT &event) const |
1587 | 1594 | fullinfo = fullinfo.replace(tmpSub.cap(0), ""); |
1588 | 1595 | } |
1589 | 1596 | |
| 1597 | // Try to make subtitle from " " |
| 1598 | QRegExp tmpSub2 = m_nlSub2; |
| 1599 | //QString tmpSubString2; |
| 1600 | if (tmpSub2.indexIn(fullinfo) != -1) |
| 1601 | { |
| 1602 | tmpSubString = tmpSub2.cap(0); |
| 1603 | tmpSubString = tmpSubString.right(tmpSubString.length() - 2); |
| 1604 | event.subtitle = tmpSubString.left(tmpSubString.length() -1); |
| 1605 | fullinfo = fullinfo.replace(tmpSub2.cap(0), ""); |
| 1606 | } |
| 1607 | |
| 1608 | |
1590 | 1609 | // This is trying to catch the case where the subtitle is in the main title |
1591 | 1610 | // but avoid cases where it isn't a subtitle e.g cd:uk |
1592 | 1611 | if (((position = event.title.indexOf(":")) != -1) && |
diff --git a/mythtv/libs/libmythtv/eitfixup.h b/mythtv/libs/libmythtv/eitfixup.h
index a724506..0f9028a 100644
a
|
b
|
class EITFixUp |
180 | 180 | const QRegExp m_nlRepeat; |
181 | 181 | const QRegExp m_nlHD; |
182 | 182 | const QRegExp m_nlSub; |
| 183 | const QRegExp m_nlSub2; |
183 | 184 | const QRegExp m_nlActors; |
184 | 185 | const QRegExp m_nlPres; |
185 | 186 | const QRegExp m_nlPersSeparator; |
diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
index 9ee2cc8..8b43d7f 100644
a
|
b
|
static void init_fixup(QMap<uint64_t,uint> &fix) |
844 | 844 | fix[ 6LL << 32 | 133 << 16 | 129] = EITFixUp::kFixHDTV; |
845 | 845 | fix[ 6LL << 32 | 133 << 16 | 130] = EITFixUp::kFixHDTV; |
846 | 846 | |
847 | | // Netherlands |
| 847 | // Netherlands DVB-C |
848 | 848 | fix[ 1000U << 16] = EITFixUp::kFixNL; |
| 849 | // Canal Digitaal DVB-S 19.2 Dutch/Belgian ONID 53 covers all CanalDigitaal TiD |
| 850 | fix[ 53U << 16] = EITFixUp::kFixNL; |
| 851 | // Canal Digitaal DVB-S 23.5 Dutch/Belgian |
| 852 | fix[ 3202LL << 32 | 3U << 16] = EITFixUp::kFixNL; |
| 853 | fix[ 3208LL << 32 | 3U << 16] = EITFixUp::kFixNL; |
| 854 | fix[ 3211LL << 32 | 3U << 16] = EITFixUp::kFixNL; |
| 855 | fix[ 3222LL << 32 | 3U << 16] = EITFixUp::kFixNL; |
| 856 | fix[ 3225LL << 32 | 3U << 16] = EITFixUp::kFixNL; |
849 | 857 | |
850 | 858 | // Finland |
851 | 859 | fix[ 8438U << 16] = // DVB-T Espoo |