summaryrefslogtreecommitdiff
path: root/libsi
diff options
context:
space:
mode:
Diffstat (limited to 'libsi')
-rw-r--r--libsi/Makefile4
-rw-r--r--libsi/descriptor.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/libsi/Makefile b/libsi/Makefile
index 2d8713b..fdc630d 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a libsi
#
-# $Id: Makefile 1.3 2004/10/16 13:31:50 kls Exp $
+# $Id: Makefile 1.4 2005/05/05 11:01:46 kls Exp $
### The C++ compiler and options:
@@ -11,6 +11,8 @@ AR = ar
ARFLAGS = ru
RANLIB = ranlib
+-include ../Make.config
+
### The directory environment:
INCLUDES +=
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 9495923..73fd105 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.10 2004/06/06 13:51:29 kls Exp $
+ * $Id: descriptor.h 1.12 2005/05/08 14:08:19 kls Exp $
* *
***************************************************************************/
@@ -283,13 +283,13 @@ private:
class SubtitlingDescriptor : public Descriptor {
public:
- class Subtitling : public Descriptor {
+ class Subtitling : public LoopElement {
public:
char languageCode[4];
int getSubtitlingType() const;
int getCompositionPageId() const;
int getAncillaryPageId() const;
- virtual int getLength() { return sizeof(item_nvod_reference); }
+ virtual int getLength() { return sizeof(item_subtitling); }
protected:
virtual void Parse();
private: