[matroska] r853 - in trunk/libmatroska: matroska src
[email protected] Sat, 2 Oct 2004 19:08:36 +0400 (MSD)
Newsgroups
gmane.comp.multimedia.matroska.cvs
Message-ID
<[email protected] >
Author: robux4
Date: 2004-10-02 19:08:36 +0400 (Sat, 02 Oct 2004)
New Revision: 853
Modified:
trunk/libmatroska/matroska/KaxClusterData.h
trunk/libmatroska/src/KaxCluster.cpp
trunk/libmatroska/src/KaxClusterData.cpp
Log:
added KaxClusterSilentTracks and KaxClusterSilentTrackNumber
Modified: trunk/libmatroska/matroska/KaxClusterData.h
===================================================================
--- trunk/libmatroska/matroska/KaxClusterData.h 2004-10-02 05:40:36 UTC (rev 852)
+++ trunk/libmatroska/matroska/KaxClusterData.h 2004-10-02 15:08:36 UTC (rev 853)
@@ -36,6 +36,7 @@
#define LIBMATROSKA_CLUSTER_DATA_H
#include "matroska/KaxTypes.h"
+#include "ebml/EbmlMaster.h"
#include "ebml/EbmlUInteger.h"
using namespace LIBEBML_NAMESPACE;
@@ -53,6 +54,28 @@
EbmlElement * Clone() const {return new KaxClusterTimecode(*this);}
};
+class MATROSKA_DLL_API KaxClusterSilentTracks : public EbmlMaster {
+ public:
+ KaxClusterSilentTracks();
+ KaxClusterSilentTracks(const KaxClusterSilentTracks & ElementToClone) :EbmlMaster(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxClusterSilentTracks);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxClusterSilentTracks(*this);}
+};
+
+class MATROSKA_DLL_API KaxClusterSilentTrackNumber : public EbmlUInteger {
+ public:
+ KaxClusterSilentTrackNumber() {}
+ KaxClusterSilentTrackNumber(const KaxClusterSilentTrackNumber & ElementToClone) :EbmlUInteger(ElementToClone) {}
+ static EbmlElement & Create() {return *(new KaxClusterSilentTrackNumber);}
+ const EbmlCallbacks & Generic() const {return ClassInfos;}
+ static const EbmlCallbacks ClassInfos;
+ operator const EbmlId &() const {return ClassInfos.GlobalId;}
+ EbmlElement * Clone() const {return new KaxClusterSilentTrackNumber(*this);}
+};
+
class MATROSKA_DLL_API KaxClusterPosition : public EbmlUInteger {
public:
KaxClusterPosition() {}
Modified: trunk/libmatroska/src/KaxCluster.cpp
===================================================================
--- trunk/libmatroska/src/KaxCluster.cpp 2004-10-02 05:40:36 UTC (rev 852)
+++ trunk/libmatroska/src/KaxCluster.cpp 2004-10-02 15:08:36 UTC (rev 853)
@@ -39,9 +39,10 @@
// sub elements
START_LIBMATROSKA_NAMESPACE
-EbmlSemantic KaxCluster_ContextList[4] =
+EbmlSemantic KaxCluster_ContextList[5] =
{
EbmlSemantic(true, true, KaxClusterTimecode::ClassInfos),
+ EbmlSemantic(false, false, KaxClusterSilentTracks::ClassInfos),
EbmlSemantic(false, true, KaxClusterPrevSize::ClassInfos),
EbmlSemantic(true, false, KaxBlockGroup::ClassInfos),
EbmlSemantic(false, true, KaxClusterPosition::ClassInfos),
Modified: trunk/libmatroska/src/KaxClusterData.cpp
===================================================================
--- trunk/libmatroska/src/KaxClusterData.cpp 2004-10-02 05:40:36 UTC (rev 852)
+++ trunk/libmatroska/src/KaxClusterData.cpp 2004-10-02 15:08:36 UTC (rev 853)
@@ -37,16 +37,31 @@
START_LIBMATROSKA_NAMESPACE
-EbmlId KaxClusterTimecode_TheId(0xE7, 1);
-EbmlId KaxClusterPrevSize_TheId(0xAB, 1);
-EbmlId KaxClusterPosition_TheId(0xA7, 1);
+EbmlId KaxClusterTimecode_TheId (0xE7, 1);
+EbmlId KaxClusterSilentTracks_TheId (0x5854, 2);
+EbmlId KaxClusterSilentTrackNumber_TheId(0x58D7, 2);
+EbmlId KaxClusterPrevSize_TheId (0xAB, 1);
+EbmlId KaxClusterPosition_TheId (0xA7, 1);
+EbmlSemantic KaxClusterSilentTracks_ContextList[1] =
+{
+ EbmlSemantic(true, true, KaxClusterSilentTrackNumber::ClassInfos),
+};
+
const EbmlSemanticContext KaxClusterTimecode_Context = EbmlSemanticContext(0, NULL, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxClusterTimecode::ClassInfos);
+const EbmlSemanticContext KaxClusterSilentTracks_Context = EbmlSemanticContext(countof(KaxClusterSilentTracks_ContextList), KaxClusterSilentTracks_ContextList, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxClusterSilentTracks::ClassInfos);
+const EbmlSemanticContext KaxClusterSilentTrackNumber_Context = EbmlSemanticContext(0, NULL, &KaxClusterSilentTracks_Context, *GetKaxGlobal_Context, &KaxClusterSilentTrackNumber::ClassInfos);
const EbmlSemanticContext KaxClusterPosition_Context = EbmlSemanticContext(0, NULL, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxClusterPosition::ClassInfos);
const EbmlSemanticContext KaxClusterPrevSize_Context = EbmlSemanticContext(0, NULL, &KaxCluster_Context, *GetKaxGlobal_Context, &KaxClusterPrevSize::ClassInfos);
const EbmlCallbacks KaxClusterTimecode::ClassInfos(KaxClusterTimecode::Create, KaxClusterTimecode_TheId, "ClusterTimecode", KaxClusterTimecode_Context);
+const EbmlCallbacks KaxClusterSilentTracks::ClassInfos(KaxClusterSilentTracks::Create, KaxClusterSilentTracks_TheId, "ClusterSilentTracks", KaxClusterSilentTracks_Context);
+const EbmlCallbacks KaxClusterSilentTrackNumber::ClassInfos(KaxClusterSilentTrackNumber::Create, KaxClusterSilentTrackNumber_TheId, "ClusterSilentTrackNumber", KaxClusterSilentTrackNumber_Context);
const EbmlCallbacks KaxClusterPrevSize::ClassInfos(KaxClusterPrevSize::Create, KaxClusterPrevSize_TheId, "ClusterPrevSize", KaxClusterPrevSize_Context);
const EbmlCallbacks KaxClusterPosition::ClassInfos(KaxClusterPosition::Create, KaxClusterPosition_TheId, "ClusterPosition", KaxClusterPosition_Context);
+KaxClusterSilentTracks::KaxClusterSilentTracks()
+:EbmlMaster(KaxClusterSilentTracks_Context)
+{}
+
END_LIBMATROSKA_NAMESPACE