summaryrefslogtreecommitdiff
path: root/patches/patch-set
diff options
context:
space:
mode:
Diffstat (limited to 'patches/patch-set')
-rw-r--r--patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch15
-rw-r--r--patches/patch-set/0004-Decrypt-teletext-stream.patch2
-rw-r--r--patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch2
-rw-r--r--patches/patch-set/0006-Ttxtsubs-plugin-hook.patch2
4 files changed, 11 insertions, 10 deletions
diff --git a/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch b/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
index caad40e..d0b6b65 100644
--- a/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
+++ b/patches/patch-set/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
@@ -1,16 +1,16 @@
-From 856573ae5f4845a0dac545d64edd5c3f7f387de3 Mon Sep 17 00:00:00 2001
+From 89999b77f6c18c965d961cfbec9b42577de1ba01 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Fri, 12 Feb 2010 21:56:41 +0100
Subject: [PATCH 3/6] Allow manual configuration of teletetxt subtitle pages in channels.conf
---
- channels.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
+ channels.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
channels.h | 1 +
vdr.5 | 7 +++++++
- 3 files changed, 54 insertions(+), 3 deletions(-)
+ 3 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/channels.c b/channels.c
-index 08ddf3e..0e23389 100644
+index 08ddf3e..488733e 100644
--- a/channels.c
+++ b/channels.c
@@ -553,6 +553,7 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
@@ -56,7 +56,7 @@ index 08ddf3e..0e23389 100644
if (fields >= 9) {
if (fields == 9) {
// allow reading of old format
-@@ -885,7 +898,36 @@ bool cChannel::Parse(const char *s)
+@@ -885,7 +898,37 @@ bool cChannel::Parse(const char *s)
}
dpids[NumDpids] = 0;
}
@@ -75,9 +75,10 @@ index 08ddf3e..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'
@@ -94,7 +95,7 @@ index 08ddf3e..0e23389 100644
if (caidbuf) {
char *p = caidbuf;
char *q;
-@@ -922,6 +964,7 @@ bool cChannel::Parse(const char *s)
+@@ -922,6 +965,7 @@ bool cChannel::Parse(const char *s)
free(sourcebuf);
free(vpidbuf);
free(apidbuf);
diff --git a/patches/patch-set/0004-Decrypt-teletext-stream.patch b/patches/patch-set/0004-Decrypt-teletext-stream.patch
index 1b90d50..f6b6c82 100644
--- a/patches/patch-set/0004-Decrypt-teletext-stream.patch
+++ b/patches/patch-set/0004-Decrypt-teletext-stream.patch
@@ -1,4 +1,4 @@
-From b941978d0b1bb23ce39f84682854ce3aeeac6c85 Mon Sep 17 00:00:00 2001
+From 7be04e0bac4569be7b713f8bf738889e99b96822 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Sun, 14 Feb 2010 01:30:34 +0100
Subject: [PATCH 4/6] Decrypt teletext stream
diff --git a/patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch b/patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch
index 1567ed1..96fd5c4 100644
--- a/patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch
+++ b/patches/patch-set/0005-Capture-teletext-subtitle-pages-from-PMT.patch
@@ -1,4 +1,4 @@
-From 0527d5ea66ee4752653b280ae0f75b47c9e36870 Mon Sep 17 00:00:00 2001
+From 5e62aa5079f0c05f64acdd9e7bcf88b5bfe0420b Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Fri, 12 Feb 2010 22:06:19 +0100
Subject: [PATCH 5/6] Capture teletext subtitle pages from PMT
diff --git a/patches/patch-set/0006-Ttxtsubs-plugin-hook.patch b/patches/patch-set/0006-Ttxtsubs-plugin-hook.patch
index 761cd4b..825e5bc 100644
--- a/patches/patch-set/0006-Ttxtsubs-plugin-hook.patch
+++ b/patches/patch-set/0006-Ttxtsubs-plugin-hook.patch
@@ -1,4 +1,4 @@
-From 85bd01ba24dbfbb8653eada418cd57929fb4c016 Mon Sep 17 00:00:00 2001
+From 5b3ec412a37777e576ca614b6417f4e2ab9d5618 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Sat, 13 Feb 2010 00:28:21 +0100
Subject: [PATCH 6/6] Ttxtsubs plugin hook