diff options
| author | Tobias Grimm <git@e-tobi.net> | 2010-02-14 23:09:55 +0100 |
|---|---|---|
| committer | Tobias Grimm <git@e-tobi.net> | 2010-02-14 23:09:55 +0100 |
| commit | f2a080551140f1ef2dff0e4a71092bdd8fc7d127 (patch) | |
| tree | 5cd1a43433e080b0c72407cb16c0ff391c6aea91 /patches/vdr-1.7.12-ttxtsubs.patch | |
| parent | 974b5b78567e350cd8b646be289b7a9c203cf9a4 (diff) | |
| download | vdr-plugin-ttxtsubs-f2a080551140f1ef2dff0e4a71092bdd8fc7d127.tar.gz vdr-plugin-ttxtsubs-f2a080551140f1ef2dff0e4a71092bdd8fc7d127.tar.bz2 | |
Fixed channels.conf parsing in vdr patch
Diffstat (limited to 'patches/vdr-1.7.12-ttxtsubs.patch')
| -rw-r--r-- | patches/vdr-1.7.12-ttxtsubs.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/patches/vdr-1.7.12-ttxtsubs.patch b/patches/vdr-1.7.12-ttxtsubs.patch index 3a6af9c..022fb34 100644 --- a/patches/vdr-1.7.12-ttxtsubs.patch +++ b/patches/vdr-1.7.12-ttxtsubs.patch @@ -26,7 +26,7 @@ index 01408cb..b280030 100644 DEFINES += -DREMOTE_KBD endif diff --git a/channels.c b/channels.c -index c14df19..0e23389 100644 +index c14df19..488733e 100644 --- a/channels.c +++ b/channels.c @@ -551,6 +551,13 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos @@ -78,7 +78,7 @@ index c14df19..0e23389 100644 if (fields >= 9) { if (fields == 9) { // allow reading of old format -@@ -879,7 +898,36 @@ bool cChannel::Parse(const char *s) +@@ -879,7 +898,37 @@ bool cChannel::Parse(const char *s) } dpids[NumDpids] = 0; } @@ -97,9 +97,10 @@ index c14df19..0e23389 100644 + if (l) + *l++ = 0; + if (sscanf(q, "%d", &page) == 1) { -+ teletextSubtitlePages[fixedTtxtSubtitlePages++] = tTeletextSubtitlePage(page); ++ teletextSubtitlePages[fixedTtxtSubtitlePages] = tTeletextSubtitlePage(page); + if (l) + strn0cpy(teletextSubtitlePages[fixedTtxtSubtitlePages].ttxtLanguage, l, MAXLANGCODE1); ++ fixedTtxtSubtitlePages++ + } + else + esyslog("ERROR: invalid Teletext page!"); // no need to set ok to 'false' @@ -116,7 +117,7 @@ index c14df19..0e23389 100644 if (caidbuf) { char *p = caidbuf; char *q; -@@ -916,6 +964,7 @@ bool cChannel::Parse(const char *s) +@@ -916,6 +965,7 @@ bool cChannel::Parse(const char *s) free(sourcebuf); free(vpidbuf); free(apidbuf); |