fixed includes

abstracttrack.cpp

@@ -1,10 +1,11 @@
-#include "mp4/mp4ids.h"
-#include "mpegaudio/mpegaudioframe.h"
-
 #include "abstracttrack.h"
 #include "exceptions.h"
 #include "mediaformat.h"
 
+#include "mp4/mp4ids.h"
+
+#include "mpegaudio/mpegaudioframe.h"
+
 using namespace std;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;

adts/adtsframe.cpp

@@ -1,5 +1,6 @@
 #include "adtsframe.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 

adts/adtsstream.cpp

@@ -1,7 +1,8 @@
 #include "adtsstream.h"
 
-#include "../mp4/mp4ids.h"
-#include "../exceptions.h"
+#include "tagparser/mp4/mp4ids.h"
+
+#include "tagparser/exceptions.h"
 
 #include <string>
 

adts/adtsstream.h

@@ -2,7 +2,8 @@
 #define MEDIA_ADTSSTREAM_H
 
 #include "adtsframe.h"
-#include "../abstracttrack.h"
+
+#include "tagparser/abstracttrack.h"
 
 namespace Media {
 

avc/avcinfo.h

@@ -1,8 +1,8 @@
 #ifndef AVCINFO_H
 #define AVCINFO_H
 
-#include "../margin.h"
-#include "../size.h"
+#include "tagparser/margin.h"
+#include "tagparser/size.h"
 
 namespace Media {
 

fieldbasedtag.h

@@ -6,8 +6,7 @@
 #include <map>
 #include <functional>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \class Media::FieldMapBasedTag

generictagfield.h

@@ -3,8 +3,7 @@
 
 #include "tagvalue.h"
 
-namespace Media
-{
+namespace Media {
 
 template <class implementationType>
 class TagField;

id3/id3v1tag.cpp

@@ -1,6 +1,7 @@
 #include "id3v1tag.h"
 #include "id3genres.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/conversionexception.h>
 

id3/id3v1tag.h

@@ -1,7 +1,7 @@
 #ifndef ID3V1TAG_H
 #define ID3V1TAG_H
 
-#include "../tag.h"
+#include "tagparser/tag.h"
 
 namespace Media
 {

id3/id3v2frame.cpp

@@ -1,7 +1,8 @@
 #include "id3v2frame.h"
 #include "id3genres.h"
 #include "id3v2frameids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/misc/memory.h>

id3/id3v2frame.h

@@ -2,9 +2,10 @@
 #define ID3V2FRAME_H
 
 #include "id3v2frameids.h"
-#include "../generictagfield.h"
-#include "../tagvalue.h"
-#include "../statusprovider.h"
+
+#include "tagparser/generictagfield.h"
+#include "tagparser/tagvalue.h"
+#include "tagparser/statusprovider.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>

id3/id3v2frameids.cpp

@@ -1,5 +1,6 @@
 #include "id3v2frameids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 namespace Media
 {

id3/id3v2tag.cpp

@@ -1,6 +1,7 @@
 #include "id3v2tag.h"
 #include "id3v2frameids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 

id3/id3v2tag.h

@@ -3,7 +3,7 @@
 
 #include "id3v2frame.h"
 
-#include "../fieldbasedtag.h"
+#include "tagparser/fieldbasedtag.h"
 
 #include <map>
 

matroska/ebmlelement.cpp

@@ -2,7 +2,8 @@
 #include "ebmlid.h"
 #include "matroskacontainer.h"
 #include "matroskaid.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/types.h>
 #include <c++utilities/conversion/stringconversion.h>

matroska/ebmlelement.h

@@ -3,8 +3,9 @@
 
 #include "ebmlid.h"
 #include "matroskaid.h"
-#include "../statusprovider.h"
-#include "../genericfileelement.h"
+
+#include "tagparser/statusprovider.h"
+#include "tagparser/genericfileelement.h"
 
 #include <c++utilities/conversion/types.h>
 

matroska/matroskaattachment.h

@@ -1,7 +1,7 @@
 #ifndef MEDIA_MATROSKAATTACHMENT_H
 #define MEDIA_MATROSKAATTACHMENT_H
 
-#include "../abstractattachment.h"
+#include "tagparser/abstractattachment.h"
 
 namespace Media {
 

matroska/matroskachapter.h

@@ -1,7 +1,7 @@
 #ifndef MEDIA_MATROSKACHAPTER_H
 #define MEDIA_MATROSKACHAPTER_H
 
-#include "../abstractchapter.h"
+#include "tagparser/abstractchapter.h"
 
 #include <memory>
 

matroska/matroskacontainer.cpp

@@ -5,9 +5,9 @@
 #include "matroskaeditionentry.h"
 #include "matroskaseekinfo.h"
 
-#include "../mediafileinfo.h"
-#include "../exceptions.h"
-#include "../backuphelper.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/backuphelper.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/misc/memory.h>

matroska/matroskacontainer.h

@@ -7,7 +7,7 @@
 #include "matroskachapter.h"
 #include "matroskaattachment.h"
 
-#include "../genericcontainer.h"
+#include "tagparser/genericcontainer.h"
 
 #include <c++utilities/conversion/types.h>
 

matroska/matroskaseekinfo.cpp

@@ -1,7 +1,7 @@
 #include "matroskaseekinfo.h"
 #include "matroskaid.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/binaryconversion.h>
 

matroska/matroskaseekinfo.h

@@ -3,7 +3,7 @@
 
 #include "ebmlelement.h"
 
-#include "../statusprovider.h"
+#include "tagparser/statusprovider.h"
 
 #include <utility>
 

matroska/matroskatag.h

@@ -2,7 +2,8 @@
 #define MEDIA_MATROSKATAG_H
 
 #include "matroskatagfield.h"
-#include "../fieldbasedtag.h"
+
+#include "tagparser/fieldbasedtag.h"
 
 namespace Media {
 

matroska/matroskatagfield.cpp

@@ -1,7 +1,8 @@
 #include "matroskatagfield.h"
 #include "ebmlelement.h"
 #include "matroskacontainer.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binarywriter.h>
 #include <c++utilities/misc/memory.h>

matroska/matroskatagfield.h

@@ -1,8 +1,8 @@
 #ifndef MEDIA_MATROSKATAGFIELD_H
 #define MEDIA_MATROSKATAGFIELD_H
 
-#include "../generictagfield.h"
-#include "../statusprovider.h"
+#include "tagparser/generictagfield.h"
+#include "tagparser/statusprovider.h"
 
 namespace Media {
 

matroska/matroskatrack.cpp

@@ -3,13 +3,15 @@
 #include "matroskacontainer.h"
 #include "matroskaid.h"
 
-#include "../avi/bitmapinfoheader.h"
-#include "../wav/waveaudiostream.h"
-#include "../mp4/mp4ids.h"
-#include "../mp4/mp4track.h"
+#include "tagparser/avi/bitmapinfoheader.h"
 
-#include "../mediaformat.h"
-#include "../exceptions.h"
+#include "tagparser/wav/waveaudiostream.h"
+
+#include "tagparser/mp4/mp4ids.h"
+#include "tagparser/mp4/mp4track.h"
+
+#include "tagparser/mediaformat.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 

matroska/matroskatrack.h

@@ -1,7 +1,7 @@
 #ifndef MEDIA_MATROSKATRACK_H
 #define MEDIA_MATROSKATRACK_H
 
-#include "../abstracttrack.h"
+#include "tagparser/abstracttrack.h"
 
 namespace Media {
 

mediafileinfo.cpp

@@ -2,23 +2,30 @@
 #include "exceptions.h"
 #include "tag.h"
 #include "signature.h"
+#include "abstracttrack.h"
+#include "backuphelper.h"
+
 #include "id3/id3v1tag.h"
 #include "id3/id3v2tag.h"
+
 #include "wav/waveaudiostream.h"
+
 #include "mpegaudio/mpegaudioframestream.h"
+
 #include "adts/adtsstream.h"
+
 #include "mp4/mp4container.h"
 #include "mp4/mp4atom.h"
 #include "mp4/mp4tag.h"
 #include "mp4/mp4ids.h"
 #include "mp4/mp4track.h"
+
 #include "matroska/ebmlelement.h"
 #include "matroska/matroskacontainer.h"
 #include "matroska/matroskatag.h"
 #include "matroska/matroskatrack.h"
+
 #include "ogg/oggcontainer.h"
-#include "abstracttrack.h"
-#include "backuphelper.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/chrono/timespan.h>

mediafileinfo.h

@@ -11,8 +11,7 @@
 #include <vector>
 #include <memory>
 
-namespace Media
-{
+namespace Media {
 
 class Tag;
 class Id3v1Tag;

mp4/mp4atom.cpp

@@ -3,7 +3,8 @@
 #include "mp4atom.h"
 #include "mp4ids.h"
 #include "mp4container.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>

mp4/mp4atom.h

@@ -3,7 +3,7 @@
 
 #include "mp4ids.h"
 
-#include "../genericfileelement.h"
+#include "tagparser/genericfileelement.h"
 
 #include <c++utilities/conversion/types.h>
 #include <c++utilities/conversion/stringconversion.h>

mp4/mp4container.cpp

@@ -1,8 +1,9 @@
 #include "mp4container.h"
 #include "mp4ids.h"
-#include "../exceptions.h"
-#include "../mediafileinfo.h"
-#include "../backuphelper.h"
+
+#include "tagparser/exceptions.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/backuphelper.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>

mp4/mp4container.h

@@ -4,7 +4,8 @@
 #include "mp4atom.h"
 #include "mp4tag.h"
 #include "mp4track.h"
-#include "../genericcontainer.h"
+
+#include "tagparser/genericcontainer.h"
 
 #include <c++utilities/conversion/types.h>
 

mp4/mp4ids.cpp

@@ -1,6 +1,6 @@
 #include "mp4ids.h"
 
-#include "../mediaformat.h"
+#include "tagparser/mediaformat.h"
 
 namespace Media {
 

mp4/mp4tag.cpp

@@ -2,7 +2,8 @@
 #include "mp4tag.h"
 #include "mp4ids.h"
 #include "mp4atom.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binarywriter.h>
 #include <c++utilities/conversion/stringconversion.h>

mp4/mp4tag.h

@@ -3,7 +3,7 @@
 
 #include "mp4tagfield.h"
 
-#include "../fieldbasedtag.h"
+#include "tagparser/fieldbasedtag.h"
 
 namespace Media
 {

mp4/mp4tagfield.cpp

@@ -2,7 +2,8 @@
 #include "mp4tagfield.h"
 #include "mp4atom.h"
 #include "mp4ids.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>

mp4/mp4tagfield.h

@@ -1,8 +1,8 @@
 #ifndef MP4TAGATOM_H
 #define MP4TAGATOM_H
 
-#include "../generictagfield.h"
-#include "../statusprovider.h"
+#include "tagparser/generictagfield.h"
+#include "tagparser/statusprovider.h"
 
 #include <vector>
 

mp4/mp4track.cpp

@@ -4,11 +4,11 @@
 #include "mp4ids.h"
 #include "mpeg4descriptor.h"
 
-#include "../mpegaudio/mpegaudioframe.h"
-#include "../mpegaudio/mpegaudioframestream.h"
+#include "tagparser/mpegaudio/mpegaudioframe.h"
+#include "tagparser/mpegaudio/mpegaudioframestream.h"
 
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>
@@ -432,6 +432,7 @@ vector<uint64> Mp4Track::readChunkSizes()
     return chunkSizes;
 }
 
+#ifdef UNDER_CONSTRUCTION
 /*!
  * \brief Reads the AVC configuration for the track.
  * \remarks
@@ -486,6 +487,7 @@ AvcConfiguration Mp4Track::parseAvcConfiguration(StatusProvider &statusProvider,
     }
     return config;
 }
+#endif
 
 /*!
  * \brief Reads the MPEG-4 elementary stream descriptor for the track.

mp4/mp4track.h

@@ -1,9 +1,11 @@
 #ifndef MP4TRACK_H
 #define MP4TRACK_H
 
-#include "../avc/avcconfiguration.h"
+#ifdef UNDER_CONSTRUCTION
+#include "tagparser/avc/avcconfiguration.h"
+#endif
 
-#include "../abstracttrack.h"
+#include "tagparser/abstracttrack.h"
 
 #include <vector>
 #include <memory>
@@ -133,7 +135,9 @@ public:
     const Mpeg4ElementaryStreamInfo *mpeg4ElementaryStreamInfo() const;
 
     // methods to parse configuration details from the track header
+#ifdef UNDER_CONSTRUCTION
     static AvcConfiguration parseAvcConfiguration(StatusProvider &statusProvider, IoUtilities::BinaryReader &reader, uint64 startOffset, uint64 size);
+#endif
     static std::unique_ptr<Mpeg4ElementaryStreamInfo> parseMpeg4ElementaryStreamInfo(StatusProvider &statusProvider, IoUtilities::BinaryReader &reader, Mp4Atom *esDescAtom);
     static std::unique_ptr<Mpeg4AudioSpecificConfig> parseAudioSpecificConfig(StatusProvider &statusProvider, std::istream &stream, uint64 startOffset, uint64 size);
     static std::unique_ptr<Mpeg4VideoSpecificConfig> parseVideoSpecificConfig(StatusProvider &statusProvider, IoUtilities::BinaryReader &reader, uint64 startOffset, uint64 size);

mp4/mpeg4descriptor.cpp

@@ -1,6 +1,5 @@
 #include "mpeg4descriptor.h"
 #include "mp4container.h"
-
 #include "mp4ids.h"
 
 #include <c++utilities/io/binaryreader.h>

mp4/mpeg4descriptor.h

@@ -1,7 +1,7 @@
 #ifndef MPEG4DESCRIPTOR_H
 #define MPEG4DESCRIPTOR_H
 
-#include "../genericfileelement.h"
+#include "tagparser/genericfileelement.h"
 
 #include <c++utilities/misc/memory.h>
 

mpegaudio/mpegaudioframe.cpp

@@ -1,5 +1,6 @@
 #include "mpegaudioframe.h"
-#include "../exceptions.h"
+
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 

mpegaudio/mpegaudioframestream.cpp

@@ -1,7 +1,7 @@
 #include "mpegaudioframestream.h"
 
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <sstream>
 

mpegaudio/mpegaudioframestream.h

@@ -2,7 +2,8 @@
 #define MPEGAUDIOFRAMESTREAM_H
 
 #include "mpegaudioframe.h"
-#include "../abstracttrack.h"
+
+#include "tagparser/abstracttrack.h"
 
 #include <list>
 

notification.h

@@ -6,8 +6,7 @@
 #include <string>
 #include <list>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief Specifies the notification type.

ogg/oggcontainer.cpp

@@ -1,7 +1,7 @@
 #include "oggcontainer.h"
 
-#include "../mediafileinfo.h"
-#include "../backuphelper.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/backuphelper.h"
 
 #include <c++utilities/io/copy.h>
 #include <c++utilities/misc/memory.h>

ogg/oggcontainer.h

@@ -5,9 +5,9 @@
 #include "oggstream.h"
 #include "oggiterator.h"
 
-#include "../vorbis/vorbiscomment.h"
+#include "tagparser/vorbis/vorbiscomment.h"
 
-#include "../genericcontainer.h"
+#include "tagparser/genericcontainer.h"
 
 #include <unordered_map>
 #include <tuple>

ogg/oggiterator.cpp

@@ -1,6 +1,6 @@
 #include "oggiterator.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 namespace Media {
 

ogg/oggpage.cpp

@@ -1,6 +1,6 @@
 #include "oggpage.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/conversion/binaryconversion.h>

ogg/oggstream.cpp

@@ -1,12 +1,12 @@
 #include "oggstream.h"
 #include "oggcontainer.h"
 
-#include "../vorbis/vorbispackagetypes.h"
-#include "../vorbis/vorbisidentificationheader.h"
+#include "tagparser/vorbis/vorbispackagetypes.h"
+#include "tagparser/vorbis/vorbisidentificationheader.h"
 
-#include "../mediafileinfo.h"
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/mediafileinfo.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <c++utilities/chrono/timespan.h>
 

ogg/oggstream.h

@@ -2,7 +2,7 @@
 #define MEDIA_OGGSTREAM_H
 
 #include "oggpage.h"
-#include "../abstracttrack.h"
+#include "abstracttrack.h"
 
 namespace Media {
 

size.h

@@ -7,8 +7,7 @@
 #include <string>
 #include <sstream>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief The Size class defines the size of a two-dimensional object using integer point precision.

tag.h

@@ -12,8 +12,7 @@
 #include <type_traits>
 #include <string>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief Specifies the tag type.

tagparser.pro

@@ -13,6 +13,10 @@ TEMPLATE = lib
 CONFIG -= qt
 CONFIG += shared
 
+underconstruction {
+    DEFINES += UNDER_CONSTRUCTION
+}
+
 SOURCES += \
     abstractcontainer.cpp \
     abstracttrack.cpp \

tagvalue.cpp

@@ -1,4 +1,5 @@
 #include "tagvalue.h"
+
 #include "id3/id3genres.h"
 
 #include <c++utilities/conversion/binaryconversion.h>

tagvalue.h

@@ -11,8 +11,7 @@
 #include <string>
 #include <memory>
 
-namespace Media
-{
+namespace Media {
 
 /*!
  * \brief Specifies the text encoding.

vorbis/vorbiscomment.cpp

@@ -1,9 +1,9 @@
 #include "vorbiscomment.h"
 #include "vorbiscommentids.h"
 
-#include "../ogg/oggiterator.h"
+#include "tagparser/ogg/oggiterator.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>

vorbis/vorbiscomment.h

@@ -3,8 +3,8 @@
 
 #include "vorbiscommentfield.h"
 
-#include "../caseinsensitivecomparer.h"
-#include "../fieldbasedtag.h"
+#include "tagparser/caseinsensitivecomparer.h"
+#include "tagparser/fieldbasedtag.h"
 
 namespace Media {
 

vorbis/vorbiscommentfield.cpp

@@ -1,11 +1,11 @@
 #include "vorbiscommentfield.h"
 #include "vorbiscommentids.h"
 
-#include "../ogg/oggiterator.h"
+#include "tagparser/ogg/oggiterator.h"
 
-#include "../id3/id3v2frame.h"
+#include "tagparser/id3/id3v2frame.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/io/binaryreader.h>
 #include <c++utilities/io/binarywriter.h>

vorbis/vorbiscommentfield.h

@@ -1,8 +1,8 @@
 #ifndef MEDIA_VORBISCOMMENTFIELD_H
 #define MEDIA_VORBISCOMMENTFIELD_H
 
-#include "../generictagfield.h"
-#include "../statusprovider.h"
+#include "tagparser/generictagfield.h"
+#include "tagparser/statusprovider.h"
 
 namespace IoUtilities {
 class BinaryReader;

vorbis/vorbisidentificationheader.cpp

@@ -1,9 +1,9 @@
 #include "vorbisidentificationheader.h"
 #include "vorbispackagetypes.h"
 
-#include "../ogg/oggiterator.h"
+#include "tagparser/ogg/oggiterator.h"
 
-#include "../exceptions.h"
+#include "tagparser/exceptions.h"
 
 #include <c++utilities/conversion/binaryconversion.h>
 

wav/waveaudiostream.cpp

@@ -1,7 +1,7 @@
 #include "waveaudiostream.h"
 
-#include "../exceptions.h"
-#include "../mediaformat.h"
+#include "tagparser/exceptions.h"
+#include "tagparser/mediaformat.h"
 
 #include <c++utilities/io/binaryreader.h>
 

wav/waveaudiostream.h

@@ -1,7 +1,7 @@
 #ifndef WAVEAUDIOSTREAM_H
 #define WAVEAUDIOSTREAM_H
 
-#include "../abstracttrack.h"
+#include "abstracttrack.h"
 
 #include <fstream>