From 22bb343f120dba244fc2f5ea42009a8c27948fda Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 8 May 2005 14:10:04 +0200 Subject: [PATCH] Fixed a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling --- CONTRIBUTORS | 1 + HISTORY | 2 ++ libsi/descriptor.h | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a2149099..cc5bdb44 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1168,6 +1168,7 @@ Marco Schl for fixing handling transparent areas in cDvbSpuBitmap for fixing a bug in libsi's SubtitlingDescriptor::getLength() for removing scaling coordinates in letterbox mode from cDvbSpu + for fixing a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling Jürgen Schmitz for reporting a bug in displaying the current channel when switching via the SVDRP diff --git a/HISTORY b/HISTORY index 625a9c21..83e2bfb6 100644 --- a/HISTORY +++ b/HISTORY @@ -3510,3 +3510,5 @@ Video Disk Recorder Revision History - Recordings now avoid zero sized video data files (thanks to Wolfgang Fitz). - Some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems (thanks to Reinhard Nissl). +- Fixed a wrong inheritance in libsi's SubtitlingDescriptor::Subtitling (thanks to + Marco Schlüßler). diff --git a/libsi/descriptor.h b/libsi/descriptor.h index d17921c2..73fd1059 100644 --- a/libsi/descriptor.h +++ b/libsi/descriptor.h @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: descriptor.h 1.11 2005/05/06 08:57:53 kls Exp $ + * $Id: descriptor.h 1.12 2005/05/08 14:08:19 kls Exp $ * * ***************************************************************************/ @@ -283,7 +283,7 @@ private: class SubtitlingDescriptor : public Descriptor { public: - class Subtitling : public Descriptor { + class Subtitling : public LoopElement { public: char languageCode[4]; int getSubtitlingType() const;