replace DEFINE_MKX_MASTER_NOBODY() with DEFINE_MKX_MASTER_CONS() for better consistency

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@83 a6f86f6d-0131-4f8e-9e7b-e335508773d5

diff --git a/matroska/KaxDefines.h b/matroska/KaxDefines.h
index ad08559e67fb78a25861e493cd84b6e4696c5749..490cf53d49bd107b572625dc9b818b54bac2e8ed 100644 (file)
--- a/matroska/KaxDefines.h
+++ b/matroska/KaxDefines.h
@@ -38,10 +38,8 @@
 \r
 #if LIBEBML_VERSION >= 0x010000\r
 #define DEFINE_MKX_CONTEXT(a)                DEFINE_xxx_CONTEXT(a,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_MASTER_NOBODY(a,b,c,d,e)  DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_MASTER(a,b,c,d,e)         DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context) \\r
-    a::a() :EbmlMaster(Context_##a) {}\r
-\r
+#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e)    DEFINE_xxx_MASTER_CONS(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_MASTER(a,b,c,d,e)         DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context)\r
 #define DEFINE_MKX_MASTER_ORPHAN(a,b,c,d)    DEFINE_xxx_MASTER_ORPHAN(a,b,c,d,*GetKaxGlobal_Context)\r
 #define DEFINE_MKX_UINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_UINTEGER_DEF(a,b,c,d,e,*GetKaxGlobal_Context,v)\r
 #define DEFINE_MKX_UINTEGER(a,b,c,d,e)       DEFINE_xxx_UINTEGER(a,b,c,d,e,*GetKaxGlobal_Context)\r
@@ -128,10 +126,8 @@ class MATROSKA_DLL_API x : public EbmlMaster { \
 \r
 #else\r
 #define DEFINE_MKX_CONTEXT(a)                DEFINE_xxx_CONTEXT(a,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_MASTER_NOBODY(a,b,c,d,e)  DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_MASTER(a,b,c,d,e)         DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context) \\r
-    a::a() :EbmlMaster(Context_##a) {}\r
-\r
+#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e)    DEFINE_xxx_MASTER_CONS(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_MASTER(a,b,c,d,e)         DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context)\r
 #define DEFINE_MKX_MASTER_ORPHAN(a,b,c,d)    DEFINE_xxx_MASTER_ORPHAN(a,b,c,d,*GetKaxGlobal_Context)\r
 #define DEFINE_MKX_UINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_UINTEGER_DEF(a,b,c,d,e,*GetKaxGlobal_Context,v)\r
 #define DEFINE_MKX_UINTEGER(a,b,c,d,e)       DEFINE_xxx_CLASS(a,b,c,d,e,*GetKaxGlobal_Context)\r

diff --git a/src/KaxAttached.cpp b/src/KaxAttached.cpp
index 5f380cb0f6b4f6bbe30cc6867ecd263fb4b83277..f2450a2a6a230d7ee0bf8a85892e9c6d6653249b 100644 (file)
--- a/src/KaxAttached.cpp
+++ b/src/KaxAttached.cpp
@@ -58,14 +58,14 @@ static const EbmlSemantic ContextList_KaxAttached[6] =
 #endif // MATROSKA_VERSION\r
 };\r
 \r
-DEFINE_MKX_MASTER_NOBODY(KaxAttached,    0x61A7, 2, KaxAttachments, "AttachedFile");\r
-DEFINE_MKX_UNISTRING(KaxFileDescription, 0x467E, 2, KaxAttachments, "FileDescription");\r
-DEFINE_MKX_UNISTRING(KaxFileName,        0x466E, 2, KaxAttachments, "FileName");\r
-DEFINE_MKX_STRING   (KaxMimeType,        0x4660, 2, KaxAttachments, "FileMimeType");\r
-DEFINE_MKX_BINARY   (KaxFileData,        0x465C, 2, KaxAttachments, "FileData");\r
-DEFINE_MKX_UINTEGER (KaxFileUID,         0x46AE, 2, KaxAttachments, "FileUID");\r
+DEFINE_MKX_MASTER_CONS(KaxAttached,        0x61A7, 2, KaxAttachments, "AttachedFile");\r
+DEFINE_MKX_UNISTRING  (KaxFileDescription, 0x467E, 2, KaxAttachments, "FileDescription");\r
+DEFINE_MKX_UNISTRING  (KaxFileName,        0x466E, 2, KaxAttachments, "FileName");\r
+DEFINE_MKX_STRING     (KaxMimeType,        0x4660, 2, KaxAttachments, "FileMimeType");\r
+DEFINE_MKX_BINARY     (KaxFileData,        0x465C, 2, KaxAttachments, "FileData");\r
+DEFINE_MKX_UINTEGER   (KaxFileUID,         0x46AE, 2, KaxAttachments, "FileUID");\r
 #if MATROSKA_VERSION >= 2\r
-DEFINE_MKX_BINARY   (KaxFileReferral,    0x4675, 2, KaxAttachments, "FileReferral");\r
+DEFINE_MKX_BINARY     (KaxFileReferral,    0x4675, 2, KaxAttachments, "FileReferral");\r
 #endif\r
 \r
 KaxAttached::KaxAttached()\r

diff --git a/src/KaxAttachments.cpp b/src/KaxAttachments.cpp
index 6b55d848e55c56e8b1c88df456222fa37a31209f..bf398812286d1ea126e1f88c8007ffefeb1a9f2e 100644 (file)
--- a/src/KaxAttachments.cpp
+++ b/src/KaxAttachments.cpp
@@ -47,7 +47,7 @@ static const EbmlSemantic ContextList_KaxAttachments[1] =
        EbmlSemantic(true, false, EBML_INFO(KaxAttached)),        ///< EBMLVersion\r
 };\r
 \r
-DEFINE_MKX_MASTER_NOBODY(KaxAttachments, 0x1941A469, 4, KaxSegment, "Attachments");\r
+DEFINE_MKX_MASTER_CONS(KaxAttachments, 0x1941A469, 4, KaxSegment, "Attachments");\r
 \r
 KaxAttachments::KaxAttachments()\r
  :EbmlMaster(Context_KaxAttachments)\r

diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
index 2f4a73774bb699e5a36fe3a5b5d76d5b40149b88..c8b29ecb312316a9154156262d9e091b918d52b5 100644 (file)
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -75,18 +75,18 @@ static const EbmlSemantic ContextList_KaxBlockMore[2] =
        EbmlSemantic(true,  true,  EBML_INFO(KaxBlockAdditional))\r
 };\r
 \r
-DEFINE_MKX_MASTER_NOBODY(KaxBlockGroup,       0xA0, 1, KaxCluster, "BlockGroup");\r
-DEFINE_MKX_BINARY_CONS  (KaxBlock,            0xA1, 1, KaxBlockGroup, "Block");\r
-DEFINE_MKX_UINTEGER     (KaxBlockDuration,    0x9B, 1, KaxBlockGroup, "BlockDuration");\r
+DEFINE_MKX_MASTER_CONS (KaxBlockGroup,       0xA0, 1, KaxCluster, "BlockGroup");\r
+DEFINE_MKX_BINARY_CONS (KaxBlock,            0xA1, 1, KaxBlockGroup, "Block");\r
+DEFINE_MKX_UINTEGER    (KaxBlockDuration,    0x9B, 1, KaxBlockGroup, "BlockDuration");\r
 #if MATROSKA_VERSION >= 2\r
-DEFINE_MKX_BINARY_CONS  (KaxSimpleBlock,      0xA3, 1, KaxCluster, "SimpleBlock");\r
-DEFINE_MKX_BINARY_CONS  (KaxBlockVirtual,     0xA2, 1, KaxBlockGroup, "BlockVirtual");\r
-DEFINE_MKX_BINARY       (KaxCodecState,       0xA4, 1, KaxBlockGroup, "CodecState");\r
+DEFINE_MKX_BINARY_CONS (KaxSimpleBlock,      0xA3, 1, KaxCluster, "SimpleBlock");\r
+DEFINE_MKX_BINARY_CONS (KaxBlockVirtual,     0xA2, 1, KaxBlockGroup, "BlockVirtual");\r
+DEFINE_MKX_BINARY      (KaxCodecState,       0xA4, 1, KaxBlockGroup, "CodecState");\r
 #endif\r
-DEFINE_MKX_MASTER       (KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions");\r
-DEFINE_MKX_MASTER       (KaxBlockMore,        0xA6, 1, KaxBlockAdditions, "BlockMore");\r
-DEFINE_MKX_UINTEGER_DEF (KaxBlockAddID,       0xEE, 1, KaxBlockMore, "BlockAddID", 1);\r
-DEFINE_MKX_BINARY       (KaxBlockAdditional,  0xA5, 1, KaxBlockMore, "BlockAdditional");\r
+DEFINE_MKX_MASTER      (KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions");\r
+DEFINE_MKX_MASTER      (KaxBlockMore,        0xA6, 1, KaxBlockAdditions, "BlockMore");\r
+DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID,       0xEE, 1, KaxBlockMore, "BlockAddID", 1);\r
+DEFINE_MKX_BINARY      (KaxBlockAdditional,  0xA5, 1, KaxBlockMore, "BlockAdditional");\r
 \r
 \r
 DataBuffer * DataBuffer::Clone()\r

diff --git a/src/KaxCluster.cpp b/src/KaxCluster.cpp
index 82b892d4e12f0cdb16fb614a96594ba4a5374565..1147a1f6ee4eddcd5789776fdf091e2e268b3054 100644 (file)
--- a/src/KaxCluster.cpp
+++ b/src/KaxCluster.cpp
@@ -56,7 +56,7 @@ static const EbmlSemantic ContextList_KaxCluster[6] =
        EbmlSemantic(false, true,  EBML_INFO(KaxClusterPosition)),\r
 };\r
 \r
-DEFINE_MKX_MASTER_NOBODY(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster");\r
+DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster");\r
 \r
 KaxCluster::KaxCluster()\r
        :EbmlMaster(Context_KaxCluster)\r

diff --git a/src/KaxTagMulti.cpp b/src/KaxTagMulti.cpp
index b77fb51326a6e69ca85105e1d4a5ac87e844bbac..50345751db02522dd99f11891081cf3a8c8a2713 100644 (file)
--- a/src/KaxTagMulti.cpp
+++ b/src/KaxTagMulti.cpp
@@ -160,9 +160,7 @@ const EbmlSemanticContext & GetKaxTagsGlobal_Context()
        return Context_KaxTagMultiGlobal;\r
 }\r
 \r
-#define DEFINE_TAG_MASTER(a,b,c,d,e)   DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxTagsGlobal_Context) \\r
-    a::a() :EbmlMaster(Context_##a) {}\r
-\r
+#define DEFINE_TAG_MASTER(a,b,c,d,e)   DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxTagsGlobal_Context)\r
 \r
 \r
 DEFINE_MKX_MASTER   (KaxTagMultiComment,           0x5B7B, 2, KaxTag, "MultiComment");\r

diff --git a/src/KaxTracks.cpp b/src/KaxTracks.cpp
index ddf0e16ee44fbf2c2a3139caa8d65fd607bfd7a9..9287f1f9ab518b41053d728b6a8a1d4117b2e73e 100644 (file)
--- a/src/KaxTracks.cpp
+++ b/src/KaxTracks.cpp
@@ -88,8 +88,8 @@ static const EbmlSemantic ContextList_KaxTrackEntry[27] =
        EbmlSemantic(false, true, EBML_INFO(KaxContentEncodings)),\r
 };\r
 \r
-DEFINE_MKX_MASTER(KaxTracks,        0x1654AE6B, 4, KaxSegment, "Tracks");\r
-DEFINE_MKX_MASTER_NOBODY(KaxTrackEntry,   0xAE, 1, KaxTracks, "TrackEntry");\r
+DEFINE_MKX_MASTER     (KaxTracks, 0x1654AE6B, 4, KaxSegment, "Tracks");\r
+DEFINE_MKX_MASTER_CONS(KaxTrackEntry,   0xAE, 1, KaxTracks, "TrackEntry");\r
 \r
 KaxTrackEntry::KaxTrackEntry()\r
        :EbmlMaster(Context_KaxTrackEntry)\r