update the v2 code to match the latest v1 changes (still far from working)

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

diff --git a/matroska/KaxDefines.h b/matroska/KaxDefines.h
index 672b5929a80721577fb469d21b36fc9279351f74..237abf062508c9ec7455068333a5d4dddc5926e9 100644 (file)
--- a/matroska/KaxDefines.h
+++ b/matroska/KaxDefines.h
@@ -37,14 +37,19 @@
 #include "ebml/EbmlElement.h"\r
 \r
 #if LIBEBML_VERSION >= 0x010000\r
-#define DEFINE_MKX_MASTER(a,b,c,d,e)    DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_UINTEGER(a,b,c,d,e)  DEFINE_xxx_UINTEGER(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_SINTEGER(a,b,c,d,e)  DEFINE_xxx_SINTEGER(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_STRING(a,b,c,d,e)    DEFINE_xxx_STRING(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_UNISTRING(a,b,c,d,e) DEFINE_xxx_UNISTRING(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_BINARY(a,b,c,d,e)    DEFINE_xxx_BINARY(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_FLOAT(a,b,c,d,e)     DEFINE_xxx_FLOAT(a,b,c,d,e,*GetKaxGlobal_Context)\r
-#define DEFINE_MKX_DATE(a,b,c,d,e)      DEFINE_xxx_DATE(a,b,c,d,e,*GetKaxGlobal_Context)\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_ORPHAN(a,b,c,d)   DEFINE_xxx_MASTER_ORPHAN(a,b,c,d,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_UINTEGER(a,b,c,d,e)      DEFINE_xxx_UINTEGER(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_SINTEGER(a,b,c,d,e)      DEFINE_xxx_SINTEGER(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_STRING(a,b,c,d,e)        DEFINE_xxx_STRING(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_UNISTRING(a,b,c,d,e)     DEFINE_xxx_UNISTRING(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_BINARY(a,b,c,d,e)        DEFINE_xxx_BINARY(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_FLOAT(a,b,c,d,e)         DEFINE_xxx_FLOAT(a,b,c,d,e,*GetKaxGlobal_Context)\r
+#define DEFINE_MKX_DATE(a,b,c,d,e)          DEFINE_xxx_DATE(a,b,c,d,e,*GetKaxGlobal_Context)\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