From 0709d357ce82213152f89eff5cd9d98e5943a6c1 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 30 Aug 2009 11:19:39 +0200 Subject: Fixed wrong bracketing in cChannel::SubtitlingType() etc --- CONTRIBUTORS | 1 + HISTORY | 4 +++- channels.h | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f80bce2f..54f27bd3 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1081,6 +1081,7 @@ Rolf Ahrenberg for adding a note about the meaning of PERCENTAGEDELTA in cRingBuffer::UpdatePercentage() for fixing handling file name length on VFAT systems in case they contain UTF-8 characters + for fixing wrong bracketing in cChannel::SubtitlingType() etc. Ralf Klueber for reporting a bug in cutting a recording if there is only a single editing mark diff --git a/HISTORY b/HISTORY index e9b13d9b..83b2498e 100644 --- a/HISTORY +++ b/HISTORY @@ -6157,6 +6157,8 @@ Video Disk Recorder Revision History Reinhard Nissl). - Implemented full handling of subtitling descriptors (thanks to Mikko Tuumanen). -2009-08-29: Version 1.7.10 +2009-08-30: Version 1.7.10 - Updated the Italian OSD texts (thanks to Diego Pierotto). +- Fixed wrong bracketing in cChannel::SubtitlingType() etc. + (thanks to Rolf Ahrenberg). diff --git a/channels.h b/channels.h index c012a7d4..634fa5a3 100644 --- a/channels.h +++ b/channels.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.h 2.5 2009/08/16 14:58:26 kls Exp $ + * $Id: channels.h 2.6 2009/08/30 11:05:54 kls Exp $ */ #ifndef __CHANNELS_H @@ -188,9 +188,9 @@ public: const char *Alang(int i) const { return (0 <= i && i < MAXAPIDS) ? alangs[i] : ""; } const char *Dlang(int i) const { return (0 <= i && i < MAXDPIDS) ? dlangs[i] : ""; } const char *Slang(int i) const { return (0 <= i && i < MAXSPIDS) ? slangs[i] : ""; } - uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS ? subtitlingTypes[i] : 0); } - uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS ? compositionPageIds[i] : 0); } - uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS ? ancillaryPageIds[i] : 0); } + uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : 0; } + uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : 0; } + uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : 0; } int Tpid(void) const { return tpid; } const int *Caids(void) const { return caids; } int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; } -- cgit v1.2.3