From: Steve Lhomme <slhomme@matroska.org>
Date: Sat, 17 Sep 2022 10:42:03 +0000 (+0200)
Subject: use the libmatroska namespace directly
X-Git-Tag: release-1.7.0~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08fb93570be7af546a9a2060a9c7115e0a6e372f;p=libmatroska

use the libmatroska namespace directly

No need to hide it behind a macro anymore. The macro is kept for existing
external code still using it.
---

diff --git a/matroska/FileKax.h b/matroska/FileKax.h
index ab5cb52..e4a0b6a 100644
--- a/matroska/FileKax.h
+++ b/matroska/FileKax.h
@@ -47,7 +47,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 //class Track;
 //class Frame;
@@ -147,7 +147,7 @@ class MATROSKA_DLL_API FileMatroska {
 
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/matroska/KaxBlock.h b/matroska/KaxBlock.h
index 69d67da..78d17df 100644
--- a/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@@ -45,7 +45,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 class KaxCluster;
 class KaxReferenceBlock;
@@ -379,6 +379,6 @@ DECLARE_MKX_BINARY_CONS(KaxBlockVirtual)
     const KaxCluster * ParentCluster;
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_BLOCK_H
diff --git a/matroska/KaxBlockData.h b/matroska/KaxBlockData.h
index bd54784..ab2ae05 100644
--- a/matroska/KaxBlockData.h
+++ b/matroska/KaxBlockData.h
@@ -42,7 +42,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 /*!
   \brief element used for B frame-likes
@@ -69,6 +69,6 @@ DECLARE_MKX_SINTEGER_CONS(KaxReferenceBlock)
         void FreeBlob();
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_BLOCK_ADDITIONAL_H
diff --git a/matroska/KaxCluster.h b/matroska/KaxCluster.h
index 14dc49b..e7babcf 100644
--- a/matroska/KaxCluster.h
+++ b/matroska/KaxCluster.h
@@ -44,7 +44,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 class KaxSegment;
 
@@ -154,6 +154,6 @@ DECLARE_MKX_MASTER_CONS(KaxCluster)
     bool AddFrameInternal(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup * PastBlock, const KaxBlockGroup * ForwBlock, LacingType lacing);
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_CLUSTER_H
diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h
index d5feb1e..dacdd14 100644
--- a/matroska/KaxContexts.h
+++ b/matroska/KaxContexts.h
@@ -40,7 +40,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 extern const EbmlSemanticContext MATROSKA_DLL_API KaxMatroska_Context;
 extern const EbmlSemanticContext MATROSKA_DLL_API KaxSegment_Context;
@@ -98,6 +98,6 @@ extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackOverlay_Context;
 extern MATROSKA_DLL_API const EbmlSemanticContext & GetKaxGlobal_Context();
 //extern MATROSKA_DLL_API const EbmlSemanticContext & GetKaxTagsGlobal_Context();
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_CONTEXTS_H
diff --git a/matroska/KaxCues.h b/matroska/KaxCues.h
index c3f214b..69e933f 100644
--- a/matroska/KaxCues.h
+++ b/matroska/KaxCues.h
@@ -43,7 +43,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 class KaxCuePoint;
 
@@ -86,6 +86,6 @@ DECLARE_MKX_MASTER(KaxCues)
     uint64 mGlobalTimecodeScale;
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_CUES_H
diff --git a/matroska/KaxCuesData.h b/matroska/KaxCuesData.h
index 56b405d..6de03f2 100644
--- a/matroska/KaxCuesData.h
+++ b/matroska/KaxCuesData.h
@@ -40,7 +40,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 class KaxBlockGroup;
 class KaxBlockBlob;
@@ -73,6 +73,6 @@ DECLARE_MKX_MASTER(KaxCueReference)
     void AddReference(const KaxBlockBlob & BlockReferenced, uint64 GlobalTimecodeScale);
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_CUES_DATA_H
diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h
index 09d17ff..dde2be4 100644
--- a/matroska/KaxInfoData.h
+++ b/matroska/KaxInfoData.h
@@ -49,7 +49,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 DECLARE_MKX_CONTEXT(KaxPrevUID)
 class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {
@@ -71,6 +71,6 @@ class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {
         EBML_CONCRETE_CLASS(KaxNextUID)
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_INFO_DATA_H
diff --git a/matroska/KaxSeekHead.h b/matroska/KaxSeekHead.h
index c6b6a4a..77238e2 100644
--- a/matroska/KaxSeekHead.h
+++ b/matroska/KaxSeekHead.h
@@ -43,7 +43,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 class KaxSegment;
 
@@ -66,6 +66,6 @@ DECLARE_MKX_MASTER(KaxSeekHead)
     KaxSeek * FindNextOf(const KaxSeek &aPrev) const;
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_SEEK_HEAD_H
diff --git a/matroska/KaxSegment.h b/matroska/KaxSegment.h
index 471f3fd..c31856e 100644
--- a/matroska/KaxSegment.h
+++ b/matroska/KaxSegment.h
@@ -41,7 +41,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 DECLARE_MKX_MASTER_CONS(KaxSegment)
   public:
@@ -57,6 +57,6 @@ DECLARE_MKX_MASTER_CONS(KaxSegment)
     uint64 GetGlobalPosition(uint64 aRelativePosition) const;
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_SEGMENT_H
diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index d4969c2..272c5dd 100644
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -46,7 +46,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 DECLARE_MKX_BINARY (KaxSeekID)
 public:
   virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;}
@@ -823,6 +823,6 @@ DECLARE_MKX_BINARY (KaxTagBinary)
 };
 
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_SEMANTIC_H
diff --git a/matroska/KaxTracks.h b/matroska/KaxTracks.h
index 2bcab64..cf76596 100644
--- a/matroska/KaxTracks.h
+++ b/matroska/KaxTracks.h
@@ -43,7 +43,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 DECLARE_MKX_MASTER(KaxTrackEntry)
   public:
@@ -73,6 +73,6 @@ DECLARE_MKX_MASTER(KaxTrackEntry)
     uint64 mGlobalTimecodeScale;
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_TRACKS_H
diff --git a/matroska/KaxTypes.h b/matroska/KaxTypes.h
index 5556357..95c7185 100644
--- a/matroska/KaxTypes.h
+++ b/matroska/KaxTypes.h
@@ -38,7 +38,7 @@
 #include "ebml/EbmlTypes.h"
 #include "matroska/c/libmatroska_t.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 enum LacingType {
   LACING_NONE = 0,
@@ -54,6 +54,6 @@ enum BlockBlobType {
   BLOCK_BLOB_ALWAYS_SIMPLE,
 };
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_TYPES_H
diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h
index 9bff703..575067d 100644
--- a/matroska/KaxVersion.h
+++ b/matroska/KaxVersion.h
@@ -38,7 +38,7 @@
 #include "ebml/EbmlConfig.h"
 #include "matroska/KaxConfig.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 #define LIBMATROSKA_VERSION 0x010604
 
@@ -49,6 +49,6 @@ extern const MATROSKA_DLL_API std::string KaxCodeDate;
   \todo Improve the CRC/ECC system (backward and forward possible ?) to fit streaming/live writing/simple reading
 */
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_VERSION_H
diff --git a/src/FileKax.cpp b/src/FileKax.cpp
index 4185fed..dfd5b54 100644
--- a/src/FileKax.cpp
+++ b/src/FileKax.cpp
@@ -42,7 +42,7 @@
 //#include "Frame.h"
 //#include "Version.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 //typedef Track *TrackID;
 
@@ -399,7 +399,7 @@ bool FileMatroska::ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary
 }
 #endif // OLD
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 void matroska_init()
 {
diff --git a/src/KaxAttached.cpp b/src/KaxAttached.cpp
index 44f8584..4d59872 100644
--- a/src/KaxAttached.cpp
+++ b/src/KaxAttached.cpp
@@ -40,7 +40,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 KaxAttached::KaxAttached(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttached) EBML_DEF_SEP EBML_EXTRA_CALL)
@@ -48,4 +48,4 @@ KaxAttached::KaxAttached(EBML_EXTRA_DEF)
   SetSizeLength(2); // mandatory min size support (for easier updating) (2^(7*2)-2 = 16Ko)
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxAttachments.cpp b/src/KaxAttachments.cpp
index 3504520..c437b2d 100644
--- a/src/KaxAttachments.cpp
+++ b/src/KaxAttachments.cpp
@@ -39,7 +39,7 @@
 using namespace LIBEBML_NAMESPACE;
 
 // sub elements
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 KaxAttachments::KaxAttachments(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttachments) EBML_DEF_SEP EBML_EXTRA_CALL)
@@ -47,4 +47,4 @@ KaxAttachments::KaxAttachments(EBML_EXTRA_DEF)
   SetSizeLength(2); // mandatory min size support (for easier updating) (2^(7*2)-2 = 16Ko)
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
index 44bdf30..c430111 100644
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -44,7 +44,7 @@
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxDefines.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 DataBuffer * DataBuffer::Clone()
 {
@@ -1059,4 +1059,4 @@ filepos_t KaxBlockVirtual::ReadData(IOCallback & input, ScopeMode /* ReadFully *
   return GetSize();
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index f17ed00..4459c10 100644
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -40,7 +40,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 const KaxBlockBlob & KaxReferenceBlock::RefBlock() const
 {
@@ -111,4 +111,4 @@ void KaxReferenceBlock::SetReferencedBlock(const KaxBlockGroup & aRefdBlock)
   SetValueIsSet();
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxCluster.cpp b/src/KaxCluster.cpp
index e8b61a5..f000c86 100644
--- a/src/KaxCluster.cpp
+++ b/src/KaxCluster.cpp
@@ -37,7 +37,7 @@
 #include "matroska/KaxDefines.h"
 
 // sub elements
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 KaxCluster::KaxCluster(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxCluster) EBML_DEF_SEP EBML_EXTRA_CALL)
@@ -290,4 +290,4 @@ uint64 KaxCluster::GetPosition() const
   return ParentSegment->GetRelativePosition(*this);
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxContexts.cpp b/src/KaxContexts.cpp
index 6975c48..6b72db1 100644
--- a/src/KaxContexts.cpp
+++ b/src/KaxContexts.cpp
@@ -42,7 +42,7 @@
 
 using namespace LIBEBML_NAMESPACE;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 DEFINE_START_SEMANTIC(KaxMatroska)
 DEFINE_SEMANTIC_ITEM(true, true, EbmlHead)
@@ -64,4 +64,4 @@ const EbmlSemanticContext & GetKaxGlobal_Context()
   return GetEbmlGlobal_Context();
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxCues.cpp b/src/KaxCues.cpp
index 2fc9885..94e9d9c 100644
--- a/src/KaxCues.cpp
+++ b/src/KaxCues.cpp
@@ -40,7 +40,7 @@
 #include "matroska/KaxSemantic.h"
 
 // sub elements
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 KaxCues::~KaxCues()
 {
@@ -153,4 +153,4 @@ uint64 KaxCues::GetTimecodePosition(uint64 aTimecode) const
   return aTrack->ClusterPosition();
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp
index 7a18231..a6ed3cb 100644
--- a/src/KaxCuesData.cpp
+++ b/src/KaxCuesData.cpp
@@ -41,7 +41,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 /*!
   \todo handle codec state checking
@@ -242,4 +242,4 @@ uint16 KaxCueTrackPositions::TrackNumber() const
 }
 
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxInfoData.cpp b/src/KaxInfoData.cpp
index 0c37b98..36f71dc 100644
--- a/src/KaxInfoData.cpp
+++ b/src/KaxInfoData.cpp
@@ -38,7 +38,7 @@
 #include "matroska/KaxDefines.h"
 #include "matroska/KaxSemantic.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 #if defined(HAVE_EBML2) || defined(HAS_EBML2)
 KaxSegmentUID::KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_DEF)
@@ -47,4 +47,4 @@ KaxSegmentUID::KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_DEF)
 }
 #endif
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxSeekHead.cpp b/src/KaxSeekHead.cpp
index bcc2ae3..c9d5b61 100644
--- a/src/KaxSeekHead.cpp
+++ b/src/KaxSeekHead.cpp
@@ -41,7 +41,7 @@
 using namespace LIBEBML_NAMESPACE;
 
 // sub elements
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 /*!
   \todo verify that the element is not already in the list
@@ -139,4 +139,4 @@ bool KaxSeek::IsEbmlId(const KaxSeek & aPoint) const
   return (aEbmlIdA == aEbmlIdB);
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxSegment.cpp b/src/KaxSegment.cpp
index ce960ac..c98c64a 100644
--- a/src/KaxSegment.cpp
+++ b/src/KaxSegment.cpp
@@ -43,7 +43,7 @@
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 KaxSegment::KaxSegment(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxSegment) EBML_DEF_SEP EBML_EXTRA_CALL)
@@ -81,4 +81,4 @@ uint64 KaxSegment::GetGlobalPosition(uint64 aRelativePosition) const
   return aRelativePosition + GetElementPosition() + HeadSize();
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index 74ff4b5..7489788 100644
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -40,7 +40,7 @@
 #include "matroska/KaxBlockData.h"
 #include "matroska/KaxCuesData.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 DEFINE_START_SEMANTIC(KaxSegment)
 DEFINE_SEMANTIC_ITEM(false, false, KaxSeekHead)
@@ -861,4 +861,4 @@ filepos_t KaxFileUsedEndTime::RenderData(IOCallback & /* output */, bool /* bFor
   return 0;
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxTracks.cpp b/src/KaxTracks.cpp
index 85a1baa..b198029 100644
--- a/src/KaxTracks.cpp
+++ b/src/KaxTracks.cpp
@@ -38,7 +38,7 @@
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 KaxTrackEntry::KaxTrackEntry(EBML_EXTRA_DEF)
   :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxTrackEntry) EBML_DEF_SEP EBML_EXTRA_CALL)
@@ -51,4 +51,4 @@ void KaxTrackEntry::EnableLacing(bool bEnable)
   *(static_cast<EbmlUInteger *>(&myLacing)) = bEnable ? 1 : 0;
 }
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/src/KaxVersion.cpp b/src/KaxVersion.cpp
index b033176..c148442 100644
--- a/src/KaxVersion.cpp
+++ b/src/KaxVersion.cpp
@@ -35,7 +35,7 @@
 
 #include "matroska/KaxVersion.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 
 const std::string KaxCodeVersion = "1.6.4";
 
@@ -44,4 +44,4 @@ const std::string KaxCodeVersion = "1.6.4";
 // remain binary compatible.
 const std::string KaxCodeDate = "Unknown";
 
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
diff --git a/test/ebml/test00.cpp b/test/ebml/test00.cpp
index a0b5a86..8609640 100644
--- a/test/ebml/test00.cpp
+++ b/test/ebml/test00.cpp
@@ -51,7 +51,7 @@
 #include "ebml/EbmlVersion.h"
 #include "matroska/KaxVersion.h"
 
-using namespace LIBMATROSKA_NAMESPACE;
+using namespace libmatroska;
 
 const char RW_FILENAME[] = "test.kax";
 
diff --git a/test/mux/test6.cpp b/test/mux/test6.cpp
index 5c87869..1076621 100644
--- a/test/mux/test6.cpp
+++ b/test/mux/test6.cpp
@@ -53,7 +53,7 @@
 #include "matroska/KaxCues.h"
 #include "matroska/KaxInfoData.h"
 
-using namespace LIBMATROSKA_NAMESPACE;
+using namespace libmatroska;
 using namespace std;
 
 unsigned int BIN_FILE_SIZE = 15000;
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
     *(static_cast<EbmlFloat *>(&SegDuration)) = 0.0;
 
     *((EbmlUnicodeString *)&GetChild<KaxMuxingApp>(MyInfos))  = L"libmatroska 0.5.0";
-    *((EbmlUnicodeString *)&GetChild<KaxWritingApp>(MyInfos)) = L"éàôï";
+    *((EbmlUnicodeString *)&GetChild<KaxWritingApp>(MyInfos)) = L"����";
     GetChild<KaxWritingApp>(MyInfos).SetDefaultSize(25);
 
     filepos_t InfoSize = MyInfos.Render(out_file);
@@ -317,7 +317,7 @@ int main(int argc, char **argv)
 
     KaxChapterDisplay & aDisplay = GetChild<KaxChapterDisplay>(aAtom);
     KaxChapterString & aChapString = GetChild<KaxChapterString>(aDisplay);
-    *static_cast<EbmlUnicodeString *>(&aChapString) = L"Le film réduit à un chapitre";
+    *static_cast<EbmlUnicodeString *>(&aChapString) = L"Le film r�duit � un chapitre";
 
     KaxChapterLanguage & aChapLang = GetChild<KaxChapterLanguage>(aDisplay);
     *static_cast<EbmlString *>(&aChapLang) = "fra";
@@ -349,7 +349,7 @@ int main(int argc, char **argv)
         *static_cast<EbmlUnicodeString *>(&aTagName) = L"NAME";
 
         KaxTagString & aTagtring = GetChild<KaxTagString>(TagSimple);
-        *static_cast<EbmlUnicodeString *>(&aTagtring) = L"Testé123";
+        *static_cast<EbmlUnicodeString *>(&aTagtring) = L"Test�123";
 
     filepos_t TagsSize = AllTags.Render(out_file, bWriteDefaultValues);
     MetaSeek.IndexThis(AllTags, FileSegment);
diff --git a/test/mux/test8.cpp b/test/mux/test8.cpp
index 2e1a6d6..46c1f78 100644
--- a/test/mux/test8.cpp
+++ b/test/mux/test8.cpp
@@ -52,7 +52,7 @@
 #include "matroska/KaxCuesData.h"
 #include "ebml/StdIOCallback.h"
 
-using namespace LIBMATROSKA_NAMESPACE;
+using namespace libmatroska;
 using namespace std;
 
 #define NO_DISPLAY_DATA
@@ -272,9 +272,9 @@ int main(int argc, char **argv)
               KaxWritingApp *pApp = static_cast<KaxWritingApp*>(ElementLevel2);
               pApp->ReadData(aStream.I_O());
 #if !defined(__CYGWIN__) && !defined(__APPLE__) && !defined(__BEOS__) && !defined(__NetBSD__)
-              wprintf(L"Writing App : %ls (éàôï)\n", UTFstring(*pApp).c_str());
+              wprintf(L"Writing App : %ls (����)\n", UTFstring(*pApp).c_str());
 #else
-              printf("Writing App : %s (éàôï)\n", UTFstring(*pApp).c_str());
+              printf("Writing App : %s (����)\n", UTFstring(*pApp).c_str());
 #endif
             }
 
diff --git a/test/utf8/test5.cpp b/test/utf8/test5.cpp
index bab137b..d46c0a2 100644
--- a/test/utf8/test5.cpp
+++ b/test/utf8/test5.cpp
@@ -41,7 +41,7 @@
 #include "FileName.hpp"
 #include "StdIOCallback.hpp"
 
-using namespace LIBMATROSKA_NAMESPACE;
+using namespace libmatroska;
 using namespace std;
 
 /*!
@@ -53,7 +53,7 @@ using namespace std;
 int main(void)
 {
     string test1 = "lhomme";
-    string test2 = "Stève"; // Supposed to be a UTF8 string
+    string test2 = "St�ve"; // Supposed to be a UTF8 string
 //    test2[2] = 0x0152; // oe mixed in one, upper case
 
 //    const wchar_t *toto = test2.c_str();
@@ -73,7 +73,7 @@ int main(void)
     // in UTF8 0xE8=1110-1000 should become 110.00110-10.001000=0xC6 0x88
 
     FileName test01(64);
-    std::string str="..toto..txt  éhé";
+    std::string str="..toto..txt  �h�";
     test01 = str;
     FileName::name_level bType = test01.Test();
     test01.MakeRelaxed();