summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-02-13 09:49:33 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-02-13 09:49:33 +0100
commit573449e9353b20e61a85965c7db05481d2338bfc (patch)
treec2377cea9b9c4bf53500d513908e5daf490522ec
parent1e74f596b238358fe0b348208d4ef714ce5dd9f2 (diff)
downloadvdr-573449e9353b20e61a85965c7db05481d2338bfc.tar.gz
vdr-573449e9353b20e61a85965c7db05481d2338bfc.tar.bz2
Improved handling subtitles of BBC channels
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--dvbsubtitle.c5
3 files changed, 5 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8a9f0e1f..beff3818 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1127,6 +1127,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for adding support for DVB-T2 to libsi
for adding support for handling DVB-T2 transponders
for suggesting to add member functions Adapter() and Frontend() to cDvbDevice
+ for improving handling subtitles of BBC channels
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 54e72a0d..246425d2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6836,7 +6836,7 @@ Video Disk Recorder Revision History
- Fixed frozen live view with device bonding in case the bonded master is used for
live viewing (reported by Uwe Scheffler).
-2012-02-12: Version 1.7.24
+2012-02-13: Version 1.7.24
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a high load in case a transponder can't be received.
@@ -6857,3 +6857,4 @@ Video Disk Recorder Revision History
case it is bonded with an other device and has no receiver attached to it.
- Fixed a possible crash when canceling VDR while displaying subtitles, and the
primary device is no longer available.
+- Improved handling subtitles of BBC channels.
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index c29277dd..aa17a7af 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
* Original author: Marco Schlüßler <marco@lordzodiac.de>
* With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
*
- * $Id: dvbsubtitle.c 2.21 2012/01/11 10:34:07 kls Exp $
+ * $Id: dvbsubtitle.c 2.22 2012/02/13 09:48:18 kls Exp $
*/
@@ -620,7 +620,7 @@ void cDvbSubtitlePage::SetState(int State)
case 0: // normal case - page update
dbgpages("page update\n");
break;
- case 1: // aquisition point - page refresh
+ case 1: // acquisition point - page refresh
dbgpages("page refresh\n");
regions.Clear();
break;
@@ -1049,7 +1049,6 @@ int cDvbSubtitleConverter::ExtractSegment(const uchar *Data, int Length, int64_t
page->SetVersion(pageVersion);
page->SetTimeout(pageTimeout);
page->SetState(bs.GetBits(2));
- page->regions.Clear();
bs.SkipBits(2); // reserved
dbgpages("Update page id %d version %d pts %"PRId64" timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State());
while (!bs.IsEOF()) {