use the libebml namespace directly

There hasn't been a case where there's no namespace in a long time.

diff --git a/matroska/FileKax.h b/matroska/FileKax.h
index e4a0b6a8c958bbace2c63316c919cf122c3cb695..b23472060e4f585dc7594d5c760abf6979a515a2 100644 (file)
--- a/matroska/FileKax.h
+++ b/matroska/FileKax.h
@@ -45,7 +45,7 @@
 //#include "Cluster.h"
 //#include "CodecHeader.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
index 78d17dff5ecb5cd24254e1457fc1b401670cdaa8..6dc6c20c7addf2a1c185059064ab89f23f5494d1 100644 (file)
--- a/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@@ -43,7 +43,7 @@
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxBlockData.h b/matroska/KaxBlockData.h
index ab2ae05a4723b5dba9c7828d610115cff02b645e..517f0ccf5eb1c456df1b1aadafabd84e7821e367 100644 (file)
--- a/matroska/KaxBlockData.h
+++ b/matroska/KaxBlockData.h
@@ -40,7 +40,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxBlock.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxCluster.h b/matroska/KaxCluster.h
index e7babcfeb03658ebeca4889262b2f75f36c1367a..31e81b86c28e68007d969e5f0d00b1f6412f99dc 100644 (file)
--- a/matroska/KaxCluster.h
+++ b/matroska/KaxCluster.h
@@ -42,7 +42,7 @@
 #include "matroska/KaxCues.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h
index dacdd14b3ff8d16a15e67bace40a493b9590a082..37808bc38b0acdc9591459569342589908a6b819 100644 (file)
--- a/matroska/KaxContexts.h
+++ b/matroska/KaxContexts.h
@@ -38,7 +38,7 @@
 #include "matroska/KaxTypes.h"
 #include "ebml/EbmlElement.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h
index 69e933fcea640716ca9f83aead63157c7708fe2d..6a9610d6145d5c534697da916d168c9d7bc937e7 100644 (file)
--- a/matroska/KaxCues.h
+++ b/matroska/KaxCues.h
@@ -41,7 +41,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxBlock.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxCuesData.h b/matroska/KaxCuesData.h
index 6de03f26b6165752d516f3fb6cda99b6536d5767..7f6bed3f239d0d3d0b83530666ae2ebded9c5762 100644 (file)
--- a/matroska/KaxCuesData.h
+++ b/matroska/KaxCuesData.h
@@ -38,7 +38,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h
index dde2be4fc4b28778f77051e612304ce649a93844..053dc88df954f72397b8cae7648d215806210da0 100644 (file)
--- a/matroska/KaxInfoData.h
+++ b/matroska/KaxInfoData.h
@@ -47,7 +47,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxSeekHead.h b/matroska/KaxSeekHead.h
index 77238e23cc4c85c8018724271eb5571965cb2a2d..f21fdcd2c28805259ec7236c96a84ce4498325eb 100644 (file)
--- a/matroska/KaxSeekHead.h
+++ b/matroska/KaxSeekHead.h
@@ -41,7 +41,7 @@
 #include "ebml/EbmlUInteger.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxSegment.h b/matroska/KaxSegment.h
index c31856e9afd2d3595c91c1203fa7f976ee85acb1..112d61d4e930db94faebd43b022c7cbcad98a5d4 100644 (file)
--- a/matroska/KaxSegment.h
+++ b/matroska/KaxSegment.h
@@ -39,7 +39,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index 272c5dd200d91b6927fa5196f587d703f5b8c6b4..d970894a0759bd49a935b6025f9550dba75e5948 100644 (file)
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -44,7 +44,7 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 DECLARE_MKX_BINARY (KaxSeekID)

diff --git a/matroska/KaxTracks.h b/matroska/KaxTracks.h
index cf76596fa56e1c5f3e486b7c1ecdce3c9d880734..ca823348b6f9459aac8d8477715a5d7c8a24b76c 100644 (file)
--- a/matroska/KaxTracks.h
+++ b/matroska/KaxTracks.h
@@ -41,7 +41,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/src/KaxAttached.cpp b/src/KaxAttached.cpp
index 4d5987217ebe09ad64d8397a1e666d9941ece2bc..881c83ac2e26659a575fac6241f65176b68186bf 100644 (file)
--- a/src/KaxAttached.cpp
+++ b/src/KaxAttached.cpp
@@ -38,7 +38,7 @@
 
 // sub elements
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/src/KaxAttachments.cpp b/src/KaxAttachments.cpp
index c437b2de441c691ec4f76ca7c41bd3e43135437e..3483d5a2701a242b01f308f11ab75510faf2cc2d 100644 (file)
--- a/src/KaxAttachments.cpp
+++ b/src/KaxAttachments.cpp
@@ -36,7 +36,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 // sub elements
 namespace libmatroska {

diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index 4459c109631b67b485ac5881f098578b9eeb9ca3..86cda3245cfc5dd6704c430fb01d11a2ab76c2b9 100644 (file)
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -38,7 +38,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp
index 6b72db14ec3eeba3d76904f3890b8ee8d52e9ded..fd92035bfb46d20af0a310e684fdcf3035edd86a 100644 (file)
--- a/src/KaxContexts.cpp
+++ b/src/KaxContexts.cpp
@@ -40,7 +40,7 @@
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxTracks.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 namespace libmatroska {
 

diff --git a/src/KaxSeekHead.cpp b/src/KaxSeekHead.cpp
index c9d5b6172fc54857cabd3da6f713547454082b95..663118259a9260fe36f628f3a20be8b96fe6cd52 100644 (file)
--- a/src/KaxSeekHead.cpp
+++ b/src/KaxSeekHead.cpp
@@ -38,7 +38,7 @@
 #include "matroska/KaxCues.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 // sub elements
 namespace libmatroska {

diff --git a/test/ebml/test0.cpp b/test/ebml/test0.cpp
index fb8e1910e05739d733c0f4ed15b0288eade969b8..ac94fe70993a2c7255a71a851283e6f6a2c77d3a 100644 (file)
--- a/test/ebml/test0.cpp
+++ b/test/ebml/test0.cpp
@@ -50,7 +50,7 @@
 #include "ebml/EbmlStream.h"
 #include "ebml/StdIOCallback.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
 const char RW_FILENAME[] = "test.kax";
 
@@ -149,7 +149,7 @@ int main(void)
   ///////////////////////////////
   //   Unicode String data
   ///////////////////////////////
-  UTFstring bString = L"Stève Lhomm\80";
+  UTFstring bString = L"St�ve Lhomm�";
   EbmlUnicodeString testUStr(200);
 
   testUStr.SetID(SemanticList[4].Id, SemanticList[4].IdLength);