frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added an EPG bugfix for the latest VOX EPG data format

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-09-15 14:35:32 +02:00
parent 849d5ba355
commit fbd75da596
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -1477,3 +1477,4 @@ Video Disk Recorder Revision History
driver (thanks to Andreas Schultz). driver (thanks to Andreas Schultz).
- Added a missing StripAudioPackets() to cDvbPlayer::Action() (thanks to - Added a missing StripAudioPackets() to cDvbPlayer::Action() (thanks to
Stefan Huelswitt). Stefan Huelswitt).
- Added an EPG bugfix for the latest VOX EPG data format.

40
eit.c
View File

@ -16,7 +16,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* $Id: eit.c 1.50 2002/09/15 13:02:28 kls Exp $ * $Id: eit.c 1.51 2002/09/15 14:35:32 kls Exp $
***************************************************************************/ ***************************************************************************/
#include "eit.h" #include "eit.h"
@ -405,7 +405,7 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
return false; return false;
} }
#define MAXEPGBUGFIXSTATS 5 #define MAXEPGBUGFIXSTATS 6
#define MAXEPGBUGFIXCHANS 50 #define MAXEPGBUGFIXCHANS 50
struct tEpgBugFixStats { struct tEpgBugFixStats {
int hits; int hits;
@ -485,6 +485,32 @@ void cEventInfo::FixEpgBugs(void)
// EPG data. Let's fix their bugs as good as we can: // EPG data. Let's fix their bugs as good as we can:
if (pTitle) { if (pTitle) {
// VOX puts too much information into the Subtitle and leaves the Extended
// Description empty:
//
// Title
// (NAT, Year Min')[ ["Subtitle". ]Extended Description]
//
if (pSubtitle && !pExtendedDescription) {
if (*pSubtitle == '(') {
char *e = strchr(pSubtitle + 1, ')');
if (e) {
if (*(e + 1)) {
if (*++e == ' ')
if (*(e + 1) == '"')
e++;
}
else
e = NULL;
char *s = e ? strdup(e) : NULL;
free(pSubtitle);
pSubtitle = s;
EpgBugFixStat(0, GetServiceID());
// now the fixes #1 and #2 below will handle the rest
}
}
}
// VOX and VIVA put the Subtitle in quotes and use either the Subtitle // VOX and VIVA put the Subtitle in quotes and use either the Subtitle
// or the Extended Description field, depending on how long the string is: // or the Extended Description field, depending on how long the string is:
// //
@ -504,7 +530,7 @@ void cEventInfo::FixEpgBugs(void)
free(pExtendedDescription); free(pExtendedDescription);
pSubtitle = s; pSubtitle = s;
pExtendedDescription = d; pExtendedDescription = d;
EpgBugFixStat(0, GetServiceID()); EpgBugFixStat(1, GetServiceID());
} }
} }
} }
@ -521,7 +547,7 @@ void cEventInfo::FixEpgBugs(void)
memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle)); memmove(pSubtitle, pSubtitle + 1, strlen(pSubtitle));
pExtendedDescription = pSubtitle; pExtendedDescription = pSubtitle;
pSubtitle = NULL; pSubtitle = NULL;
EpgBugFixStat(1, GetServiceID()); EpgBugFixStat(2, GetServiceID());
} }
} }
@ -533,7 +559,7 @@ void cEventInfo::FixEpgBugs(void)
if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) { if (pSubtitle && strcmp(pTitle, pSubtitle) == 0) {
free(pSubtitle); free(pSubtitle);
pSubtitle = NULL; pSubtitle = NULL;
EpgBugFixStat(2, GetServiceID()); EpgBugFixStat(3, GetServiceID());
} }
// ZDF.info puts the Subtitle between double quotes, which is nothing // ZDF.info puts the Subtitle between double quotes, which is nothing
@ -549,7 +575,7 @@ void cEventInfo::FixEpgBugs(void)
char *p = strrchr(pSubtitle, '"'); char *p = strrchr(pSubtitle, '"');
if (p) if (p)
*p = 0; *p = 0;
EpgBugFixStat(3, GetServiceID()); EpgBugFixStat(4, GetServiceID());
} }
} }
@ -570,7 +596,7 @@ void cEventInfo::FixEpgBugs(void)
if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) { if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten" if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
memmove(p, p + 2, strlen(p + 2) + 1); memmove(p, p + 2, strlen(p + 2) + 1);
EpgBugFixStat(4, GetServiceID()); EpgBugFixStat(5, GetServiceID());
} }
} }
p++; p++;