Move everything into namespace TagParser

abstractattachment.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::StreamDataBlock

abstractattachment.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_ABSTRACTATTACHMENT_H
-#define MEDIA_ABSTRACTATTACHMENT_H
+#ifndef TAG_PARSER_ABSTRACTATTACHMENT_H
+#define TAG_PARSER_ABSTRACTATTACHMENT_H
 
 #include "./diagnostics.h"
 
@@ -8,7 +8,7 @@
 #include <functional>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 
@@ -272,4 +272,4 @@ inline bool AbstractAttachment::isEmpty() const
 
 } // namespace Media
 
-#endif // MEDIA_ABSTRACTATTACHMENT_H
+#endif // TAG_PARSER_ABSTRACTATTACHMENT_H

abstractchapter.cpp

@@ -5,7 +5,7 @@
 using namespace std;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AbstractChapter

abstractchapter.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_ABSTRACTCHAPTER_H
-#define MEDIA_ABSTRACTCHAPTER_H
+#ifndef TAG_PARSER_ABSTRACTCHAPTER_H
+#define TAG_PARSER_ABSTRACTCHAPTER_H
 
 #include "./localeawarestring.h"
 
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class Diagnostics;
 
@@ -127,4 +127,4 @@ inline std::size_t AbstractChapter::nestedChapterCount() const
 
 } // namespace Media
 
-#endif // MEDIA_ABSTRACTCHAPTER_H
+#endif // TAG_PARSER_ABSTRACTCHAPTER_H

abstractcontainer.cpp

@@ -6,7 +6,7 @@ using namespace ChronoUtilities;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AbstractContainer

abstractcontainer.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_ABSTRACTCONTAINER_H
-#define MEDIA_ABSTRACTCONTAINER_H
+#ifndef TAG_PARSER_ABSTRACTCONTAINER_H
+#define TAG_PARSER_ABSTRACTCONTAINER_H
 
 #include "./exceptions.h"
 #include "./tagtarget.h"
@@ -16,7 +16,7 @@ class BinaryReader;
 class BinaryWriter;
 }
 
-namespace Media {
+namespace TagParser {
 
 class Tag;
 class AbstractTrack;
@@ -312,4 +312,4 @@ inline uint32 AbstractContainer::timeScale() const
 
 }
 
-#endif // MEDIA_ABSTRACTCONTAINER_H
+#endif // TAG_PARSER_ABSTRACTCONTAINER_H

abstracttrack.cpp

@@ -11,7 +11,7 @@ using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AbstractTrack

abstracttrack.h

@@ -1,5 +1,5 @@
-#ifndef ABSTRACTTRACK_H
-#define ABSTRACTTRACK_H
+#ifndef TAG_PARSER_ABSTRACTTRACK_H
+#define TAG_PARSER_ABSTRACTTRACK_H
 
 #include "./diagnostics.h"
 #include "./size.h"
@@ -16,7 +16,7 @@
 #include <iosfwd>
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 class MpegAudioFrameStream;
 class WaveAudioStream;
@@ -305,7 +305,7 @@ inline MediaType AbstractTrack::mediaType() const
  */
 inline const char *AbstractTrack::mediaTypeName() const
 {
-    return ::Media::mediaTypeName(m_mediaType);
+    return ::TagParser::mediaTypeName(m_mediaType);
 }
 
 /*!
@@ -686,4 +686,4 @@ inline bool AbstractTrack::isHeaderValid() const
 
 }
 
-#endif // ABSTRACTTRACK_H
+#endif // TAG_PARSER_ABSTRACTTRACK_H

adts/adtsframe.cpp

@@ -7,7 +7,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AdtsFrame

adts/adtsframe.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_ADTSFRAME_H
-#define MEDIA_ADTSFRAME_H
+#ifndef TAG_PARSER_ADTSFRAME_H
+#define TAG_PARSER_ADTSFRAME_H
 
 #include "../global.h"
 
@@ -9,7 +9,7 @@ namespace IoUtilities {
 class BinaryReader;
 }
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT AdtsFrame
 {
@@ -148,4 +148,4 @@ inline uint16 AdtsFrame::crc() const
 
 } // namespace Media
 
-#endif // MEDIA_ADTSFRAME_H
+#endif // TAG_PARSER_ADTSFRAME_H

adts/adtsstream.cpp

@@ -8,7 +8,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AdtsStream

adts/adtsstream.h

@@ -1,11 +1,11 @@
-#ifndef MEDIA_ADTSSTREAM_H
-#define MEDIA_ADTSSTREAM_H
+#ifndef TAG_PARSER_ADTSSTREAM_H
+#define TAG_PARSER_ADTSSTREAM_H
 
 #include "./adtsframe.h"
 
 #include "../abstracttrack.h"
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT AdtsStream : public AbstractTrack
 {
@@ -41,4 +41,4 @@ inline TrackType AdtsStream::type() const
 
 } // namespace Media
 
-#endif // MEDIA_ADTSSTREAM_H
+#endif // TAG_PARSER_ADTSSTREAM_H

aspectratio.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \struct Media::AspectRatio

aspectratio.h

@@ -1,11 +1,11 @@
-#ifndef MEDIA_ASPECTRATIO_H
-#define MEDIA_ASPECTRATIO_H
+#ifndef TAG_PARSER_ASPECTRATIO_H
+#define TAG_PARSER_ASPECTRATIO_H
 
 #include "./global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 struct TAG_PARSER_EXPORT AspectRatio {
     constexpr AspectRatio();
@@ -56,4 +56,4 @@ constexpr bool AspectRatio::isExtended() const
 
 }
 
-#endif // MEDIA_ASPECTRATIO_H
+#endif // TAG_PARSER_ASPECTRATIO_H

avc/avcconfiguration.cpp

@@ -8,7 +8,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class AvcConfiguration

avc/avcconfiguration.h

@@ -1,11 +1,11 @@
-#ifndef AVCCONFIGURATION_H
-#define AVCCONFIGURATION_H
+#ifndef TAG_PARSER_AVCCONFIGURATION_H
+#define TAG_PARSER_AVCCONFIGURATION_H
 
 #include "./avcinfo.h"
 
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFormat;
 
@@ -34,4 +34,4 @@ inline AvcConfiguration::AvcConfiguration() :
 
 }
 
-#endif // AVCCONFIGURATION_H
+#endif // TAG_PARSER_AVCCONFIGURATION_H

avc/avcinfo.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \struct Media::SpsInfo

avc/avcinfo.h

@@ -1,5 +1,5 @@
-#ifndef AVCINFO_H
-#define AVCINFO_H
+#ifndef TAG_PARSER_AVCINFO_H
+#define TAG_PARSER_AVCINFO_H
 
 #include "../margin.h"
 #include "../size.h"
@@ -10,7 +10,7 @@ class BinaryReader;
 class BitReader;
 }
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Type used to store unsigned integer values using golomb coding.
@@ -194,4 +194,4 @@ inline AvcFrame::AvcFrame() :
 
 }
 
-#endif // AVCINFO_H
+#endif // TAG_PARSER_AVCINFO_H

avi/bitmapinfoheader.cpp

@@ -4,7 +4,7 @@
 
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::BitmapInfoHeader

avi/bitmapinfoheader.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_BITMAPINFOHEADER_H
-#define MEDIA_BITMAPINFOHEADER_H
+#ifndef TAG_PARSER_BITMAPINFOHEADER_H
+#define TAG_PARSER_BITMAPINFOHEADER_H
 
 #include "../global.h"
 
@@ -9,7 +9,7 @@ namespace IoUtilities {
 class BinaryReader;
 }
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT BitmapInfoHeader
 {
@@ -33,4 +33,4 @@ public:
 
 } // namespace Media
 
-#endif // MEDIA_BITMAPINFOHEADER_H
+#endif // TAG_PARSER_BITMAPINFOHEADER_H

backuphelper.cpp

@@ -21,7 +21,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \namespace Media::BackupHelper

backuphelper.h

@@ -1,11 +1,11 @@
-#ifndef BACKUPHELPER_H
-#define BACKUPHELPER_H
+#ifndef TAG_PARSER_BACKUPHELPER_H
+#define TAG_PARSER_BACKUPHELPER_H
 
 #include "./global.h"
 
 #include <c++utilities/io/nativefilestream.h>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 class Diagnostics;
@@ -21,4 +21,4 @@ TAG_PARSER_EXPORT void handleFailureAfterFileModified(MediaFileInfo &mediaFileIn
 
 }
 
-#endif // BACKUPHELPER_H
+#endif // TAG_PARSER_BACKUPHELPER_H

basicfileinfo.cpp

@@ -13,7 +13,7 @@ using namespace std;
  *        file name, extension, directory and size for a specified file.
  */
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Constructs a new BasicFileInfo for the specified file.

basicfileinfo.h

@@ -1,5 +1,5 @@
-#ifndef BASICFILEINFO_H
-#define BASICFILEINFO_H
+#ifndef TAG_PARSER_BASICFILEINFO_H
+#define TAG_PARSER_BASICFILEINFO_H
 
 #include "./global.h"
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT BasicFileInfo
 {
@@ -132,4 +132,4 @@ inline void BasicFileInfo::reportPathChanged(const std::string &newPath)
 
 }
 
-#endif // BASICFILEINFO_H
+#endif // TAG_PARSER_BASICFILEINFO_H

caseinsensitivecomparer.h

@@ -1,5 +1,5 @@
-#ifndef CASEINSENSITIVECOMPARER
-#define CASEINSENSITIVECOMPARER
+#ifndef TAG_PARSER_CASEINSENSITIVECOMPARER
+#define TAG_PARSER_CASEINSENSITIVECOMPARER
 
 #include "./global.h"
 
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The CaseInsensitiveCharComparer struct defines a method for case-insensivive character comparsion (less).
@@ -38,5 +38,5 @@ struct TAG_PARSER_EXPORT CaseInsensitiveStringComparer
 
 }
 
-#endif // CASEINSENSITIVECOMPARER
+#endif // TAG_PARSER_CASEINSENSITIVECOMPARER
 

diagnostics.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 const char *diagLevelName(DiagLevel diagLevel)
 {

diagnostics.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Specifies the level of the diagnostic message.

exceptions.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Failure

exceptions.h

@@ -1,12 +1,12 @@
-#ifndef MEDIA_EXCEPTIONS_H
-#define MEDIA_EXCEPTIONS_H
+#ifndef TAG_PARSER_EXCEPTIONS_H
+#define TAG_PARSER_EXCEPTIONS_H
 
 #include "./global.h"
 
 #include <stdexcept>
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT Failure : public std::exception
 {
@@ -76,4 +76,4 @@ public:
 
 }
 
-#endif // MEDIA_EXCEPTIONS_H
+#endif // TAG_PARSER_EXCEPTIONS_H

fieldbasedtag.h

@@ -1,12 +1,12 @@
-#ifndef FIELDBASEDTAG_H
-#define FIELDBASEDTAG_H
+#ifndef TAG_PARSER_FIELDBASEDTAG_H
+#define TAG_PARSER_FIELDBASEDTAG_H
 
 #include "./tag.h"
 
 #include <map>
 #include <functional>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FieldMapBasedTagTraits
@@ -197,7 +197,7 @@ bool FieldMapBasedTag<ImplementationType>::internallySetValue(const IdentifierTy
  * \sa Tag::setValue()
  */
 template <class ImplementationType>
-bool FieldMapBasedTag<ImplementationType>::setValue(const IdentifierType &id, const Media::TagValue &value)
+bool FieldMapBasedTag<ImplementationType>::setValue(const IdentifierType &id, const TagParser::TagValue &value)
 {
     return static_cast<ImplementationType *>(this)->internallySetValue(id, value);
 }
@@ -414,4 +414,4 @@ void FieldMapBasedTag<ImplementationType>::ensureTextValuesAreProperlyEncoded()
 
 }
 
-#endif // FIELDBASEDTAG_H
+#endif // TAG_PARSER_FIELDBASEDTAG_H

flac/flacmetadata.cpp

@@ -15,7 +15,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FlacMetaDataBlockHeader

flac/flacmetadata.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_FLACMETADATAHEADER_H
-#define MEDIA_FLACMETADATAHEADER_H
+#ifndef TAG_PARSER_FLACMETADATAHEADER_H
+#define TAG_PARSER_FLACMETADATAHEADER_H
 
 #include "../global.h"
 
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-namespace Media {
+namespace TagParser {
 
 class TagValue;
 
@@ -311,4 +311,4 @@ inline TagValue &FlacMetaDataBlockPicture::value()
 
 }
 
-#endif // MEDIA_FLACMETADATAHEADER_H
+#endif // TAG_PARSER_FLACMETADATAHEADER_H

flac/flacstream.cpp

@@ -18,7 +18,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FlacStream

flac/flacstream.h

@@ -1,12 +1,12 @@
-#ifndef FLACSTREAM_H
-#define FLACSTREAM_H
+#ifndef TAG_PARSER_FLACSTREAM_H
+#define TAG_PARSER_FLACSTREAM_H
 
 #include "../abstracttrack.h"
 
 #include <iosfwd>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 class VorbisComment;
@@ -72,4 +72,4 @@ inline uint32 FlacStream::streamOffset() const
 
 }
 
-#endif // FLACSTREAM_H
+#endif // TAG_PARSER_FLACSTREAM_H

flac/flactooggmappingheader.cpp

@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FlacToOggMappingHeader

flac/flactooggmappingheader.h

@@ -1,9 +1,9 @@
-#ifndef MEDIA_FLACIDENTIFICATIONHEADER_H
-#define MEDIA_FLACIDENTIFICATIONHEADER_H
+#ifndef TAG_PARSER_FLACIDENTIFICATIONHEADER_H
+#define TAG_PARSER_FLACIDENTIFICATIONHEADER_H
 
 #include "./flacmetadata.h"
 
-namespace Media {
+namespace TagParser {
 
 class OggIterator;
 
@@ -69,4 +69,4 @@ inline const FlacMetaDataBlockStreamInfo &FlacToOggMappingHeader::streamInfo() c
 
 }
 
-#endif // MEDIA_FLACIDENTIFICATIONHEADER_H
+#endif // TAG_PARSER_FLACIDENTIFICATIONHEADER_H

genericcontainer.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_GENERICCONTAINER_H
-#define MEDIA_GENERICCONTAINER_H
+#ifndef TAG_PARSER_GENERICCONTAINER_H
+#define TAG_PARSER_GENERICCONTAINER_H
 
 #include "./abstractcontainer.h"
 
@@ -8,7 +8,7 @@
 #include <vector>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::GenericContainer
@@ -376,4 +376,4 @@ void GenericContainer<FileInfoType, TagType, TrackType, ElementType>::reset()
 
 } // namespace Media
 
-#endif // MEDIA_GENERICCONTAINER_H
+#endif // TAG_PARSER_GENERICCONTAINER_H

genericfileelement.h

@@ -1,5 +1,5 @@
-#ifndef GENERICFILEELEMENT_H
-#define GENERICFILEELEMENT_H
+#ifndef TAG_PARSER_GENERICFILEELEMENT_H
+#define TAG_PARSER_GENERICFILEELEMENT_H
 
 #include "./progressfeedback.h"
 #include "./exceptions.h"
@@ -20,7 +20,7 @@ class BinaryWriter;
 
 }
 
-namespace Media {
+namespace TagParser {
 
 class Diagnostics;
 
@@ -921,4 +921,4 @@ constexpr byte GenericFileElement<ImplementationType>::minimumElementSize()
 
 }
 
-#endif // GENERICFILEELEMENT_H
+#endif // TAG_PARSER_GENERICFILEELEMENT_H

generictagfield.h

@@ -1,9 +1,9 @@
-#ifndef TAGFIELD_H
-#define TAGFIELD_H
+#ifndef TAG_PARSER_TAGFIELD_H
+#define TAG_PARSER_TAGFIELD_H
 
 #include "./tagvalue.h"
 
-namespace Media {
+namespace TagParser {
 
 template <class implementationType>
 class TagField;
@@ -300,4 +300,4 @@ inline void TagField<ImplementationType>::cleared()
 
 }
 
-#endif // TAGFIELD_H
+#endif // TAG_PARSER_TAGFIELD_H

id3/id3genres.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Id3Genres

id3/id3genres.h

@@ -1,5 +1,5 @@
-#ifndef ID3GENRES_H
-#define ID3GENRES_H
+#ifndef TAG_PARSER_ID3GENRES_H
+#define TAG_PARSER_ID3GENRES_H
 
 #include "../global.h"
 
@@ -7,7 +7,7 @@
 
 #include <string>
 
-namespace Media
+namespace TagParser
 {
 
 class TAG_PARSER_EXPORT Id3Genres
@@ -49,4 +49,4 @@ constexpr bool Id3Genres::isIndexSupported(int index)
 
 }
 
-#endif // ID3GENRES_H
+#endif // TAG_PARSER_ID3GENRES_H

id3/id3v1tag.cpp

@@ -11,7 +11,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Id3v1Tag

id3/id3v1tag.h

@@ -1,9 +1,9 @@
-#ifndef ID3V1TAG_H
-#define ID3V1TAG_H
+#ifndef TAG_PARSER_ID3V1TAG_H
+#define TAG_PARSER_ID3V1TAG_H
 
 #include "../tag.h"
 
-namespace Media
+namespace TagParser
 {
 
 class Diagnostics;
@@ -45,4 +45,4 @@ private:
 
 }
 
-#endif // ID3V1TAG_H
+#endif // TAG_PARSER_ID3V1TAG_H

id3/id3v2frame.cpp

@@ -19,7 +19,7 @@ using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 namespace Id3v2TextEncodingBytes {
 enum Id3v2TextEncodingByte : byte

id3/id3v2frame.h

@@ -1,5 +1,5 @@
-#ifndef ID3V2FRAME_H
-#define ID3V2FRAME_H
+#ifndef TAG_PARSER_ID3V2FRAME_H
+#define TAG_PARSER_ID3V2FRAME_H
 
 #include "./id3v2frameids.h"
 
@@ -14,7 +14,7 @@
 #include <iosfwd>
 #include <vector>
 
-namespace Media
+namespace TagParser
 {
 
 class Id3v2Frame;
@@ -342,4 +342,4 @@ inline std::string Id3v2Frame::fieldIdToString(Id3v2Frame::IdentifierType id)
 
 }
 
-#endif // ID3V2FRAME_H
+#endif // TAG_PARSER_ID3V2FRAME_H

id3/id3v2frameids.cpp

@@ -2,7 +2,7 @@
 
 #include "../exceptions.h"
 
-namespace Media
+namespace TagParser
 {
 
 /*!

id3/id3v2frameids.h

@@ -1,11 +1,11 @@
-#ifndef ID3V2FRAMEIDS_H
-#define ID3V2FRAMEIDS_H
+#ifndef TAG_PARSER_ID3V2FRAMEIDS_H
+#define TAG_PARSER_ID3V2FRAMEIDS_H
 
 #include <c++utilities/conversion/types.h>
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 namespace Id3v2FrameIds {
 enum KnownValue : uint32 {
@@ -93,4 +93,4 @@ inline bool isTextFrame(uint32 id)
 }
 
 }
-#endif // ID3V2FRAMEIDS_H
+#endif // TAG_PARSER_ID3V2FRAMEIDS_H

id3/id3v2tag.cpp

@@ -11,7 +11,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Id3v2Tag

id3/id3v2tag.h

@@ -1,5 +1,5 @@
-#ifndef ID3V2TAG_H
-#define ID3V2TAG_H
+#ifndef TAG_PARSER_ID3V2TAG_H
+#define TAG_PARSER_ID3V2TAG_H
 
 #include "./id3v2frame.h"
 
@@ -7,7 +7,7 @@
 
 #include <map>
 
-namespace Media
+namespace TagParser
 {
 
 class Id3v2Tag;
@@ -226,4 +226,4 @@ inline uint32 Id3v2Tag::paddingSize() const
 
 }
 
-#endif // ID3V2TAG_H
+#endif // TAG_PARSER_ID3V2TAG_H

localeawarestring.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 
 

localeawarestring.h

@@ -1,12 +1,12 @@
-#ifndef MEDIA_LOCALEAWARESTRING_H
-#define MEDIA_LOCALEAWARESTRING_H
+#ifndef TAG_PARSER_LOCALEAWARESTRING_H
+#define TAG_PARSER_LOCALEAWARESTRING_H
 
 #include "./global.h"
 
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The LocaleAwareString class is a standard string with locale information (languages, countries).
@@ -82,4 +82,4 @@ inline std::vector<std::string> &LocaleAwareString::countries()
 
 } // namespace Media
 
-#endif // MEDIA_LOCALEAWARESTRING_H
+#endif // TAG_PARSER_LOCALEAWARESTRING_H

margin.h

@@ -1,5 +1,5 @@
-#ifndef MARGIN_H
-#define MARGIN_H
+#ifndef TAG_PARSER_MARGIN_H
+#define TAG_PARSER_MARGIN_H
 
 #include "./global.h"
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The Margin class defines the four margins of a rectangle.
@@ -127,4 +127,4 @@ inline std::string Margin::toString() const
 
 }
 
-#endif // MARGIN_H
+#endif // TAG_PARSER_MARGIN_H

matroska/ebmlelement.cpp

@@ -21,7 +21,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::EbmlElement

matroska/ebmlelement.h

@@ -1,5 +1,5 @@
-#ifndef EBMLELEMENT_H
-#define EBMLELEMENT_H
+#ifndef TAG_PARSER_EBMLELEMENT_H
+#define TAG_PARSER_EBMLELEMENT_H
 
 #include "./ebmlid.h"
 #include "./matroskaid.h"
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaContainer;
@@ -130,4 +130,4 @@ inline uint64 EbmlElement::firstChildOffset() const
 }
 
 
-#endif // EBMLELEMENT_H
+#endif // TAG_PARSER_EBMLELEMENT_H

matroska/ebmlid.h

@@ -1,9 +1,9 @@
-#ifndef EBMLID_H
-#define EBMLID_H
+#ifndef TAG_PARSER_EBMLID_H
+#define TAG_PARSER_EBMLID_H
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates all EBML ID values.
@@ -67,4 +67,4 @@ enum SignatureElementListSlotIds
 
 }
 
-#endif // EBMLID_H
+#endif // TAG_PARSER_EBMLID_H

matroska/matroskaattachment.cpp

@@ -12,7 +12,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaAttachment

matroska/matroskaattachment.h

@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKAATTACHMENT_H
-#define MEDIA_MATROSKAATTACHMENT_H
+#ifndef TAG_PARSER_MATROSKAATTACHMENT_H
+#define TAG_PARSER_MATROSKAATTACHMENT_H
 
 #include "../abstractattachment.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaAttachment;
@@ -90,4 +90,4 @@ inline MatroskaAttachmentMaker MatroskaAttachment::prepareMaking(Diagnostics &di
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKAATTACHMENT_H
+#endif // TAG_PARSER_MATROSKAATTACHMENT_H

matroska/matroskachapter.cpp

@@ -12,7 +12,7 @@ using namespace std;
 using namespace ChronoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class MatroskaChapter

matroska/matroskachapter.h

@@ -1,11 +1,11 @@
-#ifndef MEDIA_MATROSKACHAPTER_H
-#define MEDIA_MATROSKACHAPTER_H
+#ifndef TAG_PARSER_MATROSKACHAPTER_H
+#define TAG_PARSER_MATROSKACHAPTER_H
 
 #include "../abstractchapter.h"
 
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 
@@ -47,4 +47,4 @@ inline std::size_t MatroskaChapter::nestedChapterCount() const
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKACHAPTER_H
+#endif // TAG_PARSER_MATROSKACHAPTER_H

matroska/matroskacontainer.cpp

@@ -31,7 +31,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 constexpr const char appInfo[] = APP_NAME " v" APP_VERSION;
 constexpr uint64 appInfoElementDataSize = sizeof(appInfo) - 1;

matroska/matroskacontainer.h

@@ -1,5 +1,5 @@
-#ifndef MATROSKACONTAINER_H
-#define MATROSKACONTAINER_H
+#ifndef TAG_PARSER_MATROSKACONTAINER_H
+#define TAG_PARSER_MATROSKACONTAINER_H
 
 #include "./ebmlelement.h"
 #include "./matroskatag.h"
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class MatroskaSeekInfo;
 class MatroskaEditionEntry;

matroska/matroskacues.cpp

@@ -6,7 +6,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class MatroskaOffsetStates

matroska/matroskacues.h

@@ -1,12 +1,12 @@
-#ifndef MEDIA_MATROSKACUES_H
-#define MEDIA_MATROSKACUES_H
+#ifndef TAG_PARSER_MATROSKACUES_H
+#define TAG_PARSER_MATROSKACUES_H
 
 #include "./ebmlelement.h"
 
 #include <unordered_map>
 #include <ostream>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT MatroskaOffsetStates
 {
@@ -113,4 +113,4 @@ inline void MatroskaCuePositionUpdater::clear()
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKACUES_H
+#endif // TAG_PARSER_MATROSKACUES_H

matroska/matroskaeditionentry.cpp

@@ -13,7 +13,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class MatroskaEditionEntry

matroska/matroskaeditionentry.h

@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKAEDITIONENTRY_H
-#define MEDIA_MATROSKAEDITIONENTRY_H
+#ifndef TAG_PARSER_MATROSKAEDITIONENTRY_H
+#define TAG_PARSER_MATROSKAEDITIONENTRY_H
 
 #include "./matroskachapter.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 
@@ -84,4 +84,4 @@ inline const std::vector<std::unique_ptr<MatroskaChapter> > &MatroskaEditionEntr
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKAEDITIONENTRY_H
+#endif // TAG_PARSER_MATROSKAEDITIONENTRY_H

matroska/matroskaid.cpp

@@ -1,7 +1,7 @@
 #include "./ebmlid.h"
 #include "./matroskaid.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates the most common Matroska element IDs.

matroska/matroskaid.h

@@ -1,11 +1,11 @@
-#ifndef MATROSKAIDS_H
-#define MATROSKAIDS_H
+#ifndef TAG_PARSER_MATROSKAIDS_H
+#define TAG_PARSER_MATROSKAIDS_H
 
 #include "../global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 namespace MatroskaIds {
 
@@ -537,4 +537,4 @@ TAG_PARSER_EXPORT MatroskaElementLevel matroskaIdLevel(uint32 matroskaId);
 
 }
 
-#endif // MATROSKAIDS_H
+#endif // TAG_PARSER_MATROSKAIDS_H

matroska/matroskaseekinfo.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaSeekInfo

matroska/matroskaseekinfo.h

@@ -1,11 +1,11 @@
-#ifndef MEDIA_MATROSKASEEKINFO_H
-#define MEDIA_MATROSKASEEKINFO_H
+#ifndef TAG_PARSER_MATROSKASEEKINFO_H
+#define TAG_PARSER_MATROSKASEEKINFO_H
 
 #include "./ebmlelement.h"
 
 #include <utility>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT MatroskaSeekInfo
 {
@@ -69,4 +69,4 @@ inline std::vector<std::pair<EbmlElement::IdentifierType, uint64> > &MatroskaSee
 
 }
 
-#endif // MEDIA_MATROSKASEEKINFO_H
+#endif // TAG_PARSER_MATROSKASEEKINFO_H

matroska/matroskatag.cpp

@@ -10,7 +10,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaTag

matroska/matroskatag.h

@@ -1,12 +1,12 @@
-#ifndef MEDIA_MATROSKATAG_H
-#define MEDIA_MATROSKATAG_H
+#ifndef TAG_PARSER_MATROSKATAG_H
+#define TAG_PARSER_MATROSKATAG_H
 
 #include "./matroskatagfield.h"
 #include "./matroskatagid.h"
 
 #include "../fieldbasedtag.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaTag;
@@ -107,4 +107,4 @@ inline bool MatroskaTag::canEncodingBeUsed(TagTextEncoding encoding) const
 
 }
 
-#endif // MEDIA_MATROSKATAG_H
+#endif // TAG_PARSER_MATROSKATAG_H

matroska/matroskatagfield.cpp

@@ -12,7 +12,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaTagField

matroska/matroskatagfield.h

@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKATAGFIELD_H
-#define MEDIA_MATROSKATAGFIELD_H
+#ifndef TAG_PARSER_MATROSKATAGFIELD_H
+#define TAG_PARSER_MATROSKATAGFIELD_H
 
 #include "../generictagfield.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaTagField;
@@ -130,4 +130,4 @@ inline void MatroskaTagField::cleared()
 
 }
 
-#endif // MEDIA_MATROSKATAGFIELD_H
+#endif // TAG_PARSER_MATROSKATAGFIELD_H

matroska/matroskatagid.cpp

@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 namespace MatroskaTagIds {
 

matroska/matroskatagid.h

@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKATAGIDS_H
-#define MEDIA_MATROSKATAGIDS_H
+#ifndef TAG_PARSER_MATROSKATAGIDS_H
+#define TAG_PARSER_MATROSKATAGIDS_H
 
 #include "../tagtarget.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates Matroska tag IDs.
@@ -169,7 +169,7 @@ inline TAG_PARSER_EXPORT const char *mood() {
     return "MOOD";
 }
 inline TAG_PARSER_EXPORT const char *originalMediaType() {
-    return "ORIGINAL_MEDIA_TYPE";
+    return "ORIGINAL_TAG_PARSER_TYPE";
 }
 inline TAG_PARSER_EXPORT const char *contentType() {
     return "CONTENT_TYPE";
@@ -386,4 +386,4 @@ inline TAG_PARSER_EXPORT uint64 matroskaTagTargetLevelValue(TagTargetLevel targe
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKATAGIDS_H
+#endif // TAG_PARSER_MATROSKATAGIDS_H

matroska/matroskatrack.cpp

@@ -21,7 +21,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaTrack
@@ -500,7 +500,7 @@ void MatroskaTrack::internalParseHeader(Diagnostics &diag)
         break;
     case GeneralMediaFormat::Avc:
         if((codecPrivateElement = m_trackElement->childById(MatroskaIds::CodecPrivate, diag))) {
-            auto avcConfig = make_unique<Media::AvcConfiguration>();
+            auto avcConfig = make_unique<TagParser::AvcConfiguration>();
             try {
                 m_istream->seekg(codecPrivateElement->dataOffset());
                 avcConfig->parse(m_reader, codecPrivateElement->dataSize());

matroska/matroskatrack.h

@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKATRACK_H
-#define MEDIA_MATROSKATRACK_H
+#ifndef TAG_PARSER_MATROSKATRACK_H
+#define TAG_PARSER_MATROSKATRACK_H
 
 #include "../abstracttrack.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaContainer;
@@ -103,4 +103,4 @@ inline void MatroskaTrack::makeHeader(std::ostream &stream, Diagnostics &diag) c
 
 }
 
-#endif // MEDIA_MATROSKATRACK_H
+#endif // TAG_PARSER_MATROSKATRACK_H

mediafileinfo.cpp

@@ -57,7 +57,7 @@ using namespace ChronoUtilities;
  * \brief Contains utility classes helping to read and write streams.
  */
 
-namespace Media {
+namespace TagParser {
 
 #ifdef FORCE_FULL_PARSE_DEFAULT
 # define MEDIAINFO_CPP_FORCE_FULL_PARSE true
@@ -747,7 +747,7 @@ const char *MediaFileInfo::containerFormatAbbreviation() const
     default:
         ;
     }
-    return Media::containerFormatAbbreviation(m_containerFormat, mediaType, version);
+    return TagParser::containerFormatAbbreviation(m_containerFormat, mediaType, version);
 }
 
 /*!
@@ -772,7 +772,7 @@ const char *MediaFileInfo::mimeType() const
     default:
         mediaType = MediaType::Unknown;
     }
-    return Media::containerMimeType(m_containerFormat, mediaType);
+    return TagParser::containerMimeType(m_containerFormat, mediaType);
 }
 
 /*!

mediafileinfo.h

@@ -1,5 +1,5 @@
-#ifndef MEDIAINFO_H
-#define MEDIAINFO_H
+#ifndef TAG_PARSER_MEDIAINFO_H
+#define TAG_PARSER_MEDIAINFO_H
 
 #include "./signature.h"
 #include "./basicfileinfo.h"
@@ -9,7 +9,7 @@
 #include <unordered_set>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class Tag;
 class Id3v1Tag;
@@ -95,9 +95,9 @@ public:
     ParsingStatus tracksParsingStatus() const;
     std::size_t trackCount() const;
     std::vector<AbstractTrack *> tracks() const;
-    bool hasTracksOfType(Media::MediaType type) const;
+    bool hasTracksOfType(TagParser::MediaType type) const;
     ChronoUtilities::TimeSpan duration() const;
-    std::unordered_set<std::string> availableLanguages(Media::MediaType type = Media::MediaType::Audio) const;
+    std::unordered_set<std::string> availableLanguages(TagParser::MediaType type = TagParser::MediaType::Audio) const;
     std::string technicalSummary() const;
     bool areTracksSupported() const;
     // ... the tags
@@ -229,7 +229,7 @@ inline ContainerFormat MediaFileInfo::containerFormat() const
  */
 inline const char *MediaFileInfo::containerFormatName() const
 {
-    return Media::containerFormatName(m_containerFormat);
+    return TagParser::containerFormatName(m_containerFormat);
 }
 
 /*!
@@ -244,7 +244,7 @@ inline const char *MediaFileInfo::containerFormatName() const
  */
 inline const char *MediaFileInfo::containerFormatSubversion() const
 {
-    return Media::containerFormatSubversion(m_containerFormat);
+    return TagParser::containerFormatSubversion(m_containerFormat);
 }
 
 /*!
@@ -593,4 +593,4 @@ inline void MediaFileInfo::setForceIndexPosition(bool forceIndexPosition)
 
 }
 
-#endif // MEDIAINFO_H
+#endif // TAG_PARSER_MEDIAINFO_H

mediaformat.cpp

@@ -1,6 +1,6 @@
 #include "./mediaformat.h"
 
-namespace Media {
+namespace TagParser {
 
 using namespace SubFormats;
 

mediaformat.h

@@ -1,11 +1,11 @@
-#ifndef MEDIAFORMAT_H
-#define MEDIAFORMAT_H
+#ifndef TAG_PARSER_MEDIAFORMAT_H
+#define TAG_PARSER_MEDIAFORMAT_H
 
 #include "./global.h"
 
 #include <utility>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The MediaType enum specifies the type of media data (audio, video, text, ...).
@@ -328,5 +328,5 @@ inline MediaFormat::operator bool() const
 
 }
 
-#endif // MEDIAFORMAT_H
+#endif // TAG_PARSER_MEDIAFORMAT_H
 

mp4/mp4atom.cpp

@@ -17,7 +17,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4Atom

mp4/mp4atom.h

@@ -1,5 +1,5 @@
-#ifndef MP4ATOM_H
-#define MP4ATOM_H
+#ifndef TAG_PARSER_MP4ATOM_H
+#define TAG_PARSER_MP4ATOM_H
 
 #include "./mp4ids.h"
 
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <memory>
 
-namespace Media
+namespace TagParser
 {
 
 class Mp4Atom;
@@ -89,4 +89,4 @@ inline void Mp4Atom::addHeaderSize(uint64 &dataSize)
 
 }
 
-#endif // MP4ATOM_H
+#endif // TAG_PARSER_MP4ATOM_H

mp4/mp4container.cpp

@@ -22,7 +22,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4Container

mp4/mp4container.h

@@ -1,5 +1,5 @@
-#ifndef MEDIA_MP4CONTAINER_H
-#define MEDIA_MP4CONTAINER_H
+#ifndef TAG_PARSER_MP4CONTAINER_H
+#define TAG_PARSER_MP4CONTAINER_H
 
 #include "./mp4atom.h"
 #include "./mp4tag.h"
@@ -12,7 +12,7 @@
 #include <memory>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 
@@ -56,4 +56,4 @@ inline bool Mp4Container::isFragmented() const
 
 }
 
-#endif // MEDIA_MP4CONTAINER_H
+#endif // TAG_PARSER_MP4CONTAINER_H

mp4/mp4ids.cpp

@@ -2,7 +2,7 @@
 
 #include "../mediaformat.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates the most common MP4 atom IDs.

mp4/mp4ids.h

@@ -1,11 +1,11 @@
-#ifndef MP4TAGATOMNAMES_H
-#define MP4TAGATOMNAMES_H
+#ifndef TAG_PARSER_MP4IDS_H
+#define TAG_PARSER_MP4IDS_H
 
 #include "../global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media
+namespace TagParser
 {
 
 class MediaFormat;
@@ -712,4 +712,4 @@ enum class CountryCode
 
 }
 
-#endif // MP4TAGATOMNAMES_H
+#endif // TAG_PARSER_MP4IDS_H

mp4/mp4tag.cpp

@@ -12,7 +12,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4ExtendedFieldId

mp4/mp4tag.h

@@ -1,11 +1,11 @@
-#ifndef MP4TAG_H
-#define MP4TAG_H
+#ifndef TAG_PARSER_MP4TAG_H
+#define TAG_PARSER_MP4TAG_H
 
 #include "./mp4tagfield.h"
 
 #include "../fieldbasedtag.h"
 
-namespace Media
+namespace TagParser
 {
 
 class Mp4Atom;
@@ -176,4 +176,4 @@ inline bool Mp4Tag::setValue(const std::string &mean, const std::string &name, c
 
 }
 
-#endif // MP4TAG_H
+#endif // TAG_PARSER_MP4TAG_H

mp4/mp4tagfield.cpp

@@ -17,7 +17,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4TagField

mp4/mp4tagfield.h

@@ -1,5 +1,5 @@
-#ifndef MP4TAGATOM_H
-#define MP4TAGATOM_H
+#ifndef TAG_PARSER_MP4TAGATOM_H
+#define TAG_PARSER_MP4TAGATOM_H
 
 #include "../generictagfield.h"
 
@@ -9,7 +9,7 @@
 #include <vector>
 #include <sstream>
 
-namespace Media
+namespace TagParser
 {
 
 /*!
@@ -239,4 +239,4 @@ inline std::string Mp4TagField::fieldIdToString(Mp4TagField::IdentifierType id)
 
 }
 
-#endif // MP4TAGATOM_H
+#endif // TAG_PARSER_MP4TAGATOM_H

mp4/mp4track.cpp

@@ -26,7 +26,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The TrackHeaderInfo struct holds information about the present track header (tkhd atom) and
@@ -1638,7 +1638,7 @@ void Mp4Track::internalParseHeader(Diagnostics &diag)
                 // parse AVC configuration
                 if(Mp4Atom *avcConfigAtom = esDescParentAtom->childById(Mp4AtomIds::AvcConfiguration, diag)) {
                     m_istream->seekg(avcConfigAtom->dataOffset());
-                    m_avcConfig = make_unique<Media::AvcConfiguration>();
+                    m_avcConfig = make_unique<TagParser::AvcConfiguration>();
                     try {
                         m_avcConfig->parse(reader, avcConfigAtom->dataSize());
                         addInfo(*m_avcConfig, *this);

mp4/mp4track.h

@@ -1,12 +1,12 @@
-#ifndef MP4TRACK_H
-#define MP4TRACK_H
+#ifndef TAG_PARSER_MP4TRACK_H
+#define TAG_PARSER_MP4TRACK_H
 
 #include "../abstracttrack.h"
 
 #include <vector>
 #include <memory>
 
-namespace Media
+namespace TagParser
 {
 
 class Mp4Atom;
@@ -141,7 +141,7 @@ public:
     // methods to read the "index" (chunk offsets and sizes)
     std::vector<uint64> readChunkOffsets(bool parseFragments, Diagnostics &diag);
     std::vector<std::tuple<uint32, uint32, uint32> > readSampleToChunkTable(Diagnostics &diag);
-    std::vector<uint64> readChunkSizes(Media::Diagnostics &diag);
+    std::vector<uint64> readChunkSizes(TagParser::Diagnostics &diag);
 
     // methods to make the track header
     void bufferTrackAtoms(Diagnostics &diag);
@@ -259,4 +259,4 @@ inline const AvcConfiguration *Mp4Track::avcConfiguration() const
 
 }
 
-#endif // MP4TRACK_H
+#endif // TAG_PARSER_MP4TRACK_H

mp4/mpeg4descriptor.cpp

@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mpeg4Descriptor

mp4/mpeg4descriptor.h

@@ -1,11 +1,11 @@
-#ifndef MPEG4DESCRIPTOR_H
-#define MPEG4DESCRIPTOR_H
+#ifndef TAG_PARSER_MPEG4DESCRIPTOR_H
+#define TAG_PARSER_MPEG4DESCRIPTOR_H
 
 #include "../genericfileelement.h"
 
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class Mp4Container;
 class Mpeg4Descriptor;
@@ -81,4 +81,4 @@ inline uint64 Mpeg4Descriptor::firstChildOffset() const
 
 }
 
-#endif // MPEG4DESCRIPTOR_H
+#endif // TAG_PARSER_MPEG4DESCRIPTOR_H

mpegaudio/mpegaudioframe.cpp

@@ -7,7 +7,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Returns the string representation for the specified \a channelMode.

mpegaudio/mpegaudioframe.h

@@ -1,5 +1,5 @@
-#ifndef MP3FRAMEAUDIOSTREAM_H
-#define MP3FRAMEAUDIOSTREAM_H
+#ifndef TAG_PARSER_MP3FRAMEAUDIOSTREAM_H
+#define TAG_PARSER_MP3FRAMEAUDIOSTREAM_H
 
 #include "../global.h"
 
@@ -11,7 +11,7 @@ namespace IoUtilities {
 class BinaryReader;
 }
 
-namespace Media
+namespace TagParser
 {
 
 /*!
@@ -238,4 +238,4 @@ inline uint32 MpegAudioFrame::xingQualityIndicator() const
 
 }
 
-#endif // MP3FRAMEAUDIOSTREAM_H
+#endif // TAG_PARSER_MP3FRAMEAUDIOSTREAM_H

mpegaudio/mpegaudioframestream.cpp

@@ -10,7 +10,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MpegAudioFrameStream

mpegaudio/mpegaudioframestream.h

@@ -1,5 +1,5 @@
-#ifndef MPEGAUDIOFRAMESTREAM_H
-#define MPEGAUDIOFRAMESTREAM_H
+#ifndef TAG_PARSER_MPEGAUDIOFRAMESTREAM_H
+#define TAG_PARSER_MPEGAUDIOFRAMESTREAM_H
 
 #include "./mpegaudioframe.h"
 
@@ -7,7 +7,7 @@
 
 #include <list>
 
-namespace Media
+namespace TagParser
 {
 
 class TAG_PARSER_EXPORT MpegAudioFrameStream : public AbstractTrack

ogg/oggcontainer.cpp

@@ -16,7 +16,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::OggVorbisComment