tests: Move format specific flags from header

tests/overall.h

@@ -1,3 +1,6 @@
+#ifndef TAGPARSER_OVERALL_TESTS_H
+#define TAGPARSER_OVERALL_TESTS_H
+
 #include "../mediafileinfo.h"
 #include "../tagvalue.h"
 
@@ -25,44 +28,6 @@ enum class TagStatus
     Removed
 };
 
-namespace MkvTestFlags {
-enum TestFlag
-{
-    ForceRewring = 0x1,
-    KeepTagPos = 0x2,
-    TagsBeforeData = 0x40,
-    RemoveTag = KeepTagPos & TagsBeforeData,
-    KeepIndexPos = 0x4,
-    IndexBeforeData = 0x80,
-    PaddingConstraints = 0x8,
-    ForceTagPos = 0x10,
-    ForceIndexPos = 0x20,
-};
-}
-
-namespace Mp4TestFlags {
-enum TestFlag
-{
-    ForceRewring = 0x1,
-    KeepTagPos = 0x2,
-    TagsBeforeData = 0x10,
-    RemoveTag = KeepTagPos & TagsBeforeData,
-    PaddingConstraints = 0x4,
-    ForceTagPos = 0x8,
-};
-}
-
-namespace Mp3TestFlags {
-enum TestFlag
-{
-    ForceRewring = 0x1,
-    Id3v2AndId3v1 = 0x2,
-    PaddingConstraints = 0x4,
-    Id3v1Only = 0x8,
-    RemoveTag = Id3v2AndId3v1 & Id3v1Only,
-};
-}
-
 namespace SimpleTestFlags {
 enum TestFlag
 {
@@ -139,6 +104,7 @@ private:
     void removeAllTags();
     void noop();
     void createMkvWithNestedTags();
+    void createFlacFiles();
 
 public:
     void testMkvParsing();
@@ -166,6 +132,10 @@ private:
     string m_testCover;
     queue<TagValue> m_preservedMetaData;
     string m_nestedTagsMkvPath;
+    string m_rawFlacPath;
+    string m_flacInOggPath;
     TagStatus m_tagStatus;
     uint16 m_mode;
 };
+
+#endif // TAGPARSER_OVERALL_TESTS_H

tests/overallmkv.cpp

@@ -11,6 +11,21 @@
 #include <fstream>
 #include <cstring>
 
+namespace MkvTestFlags {
+enum TestFlag
+{
+    ForceRewring = 0x1,
+    KeepTagPos = 0x2,
+    TagsBeforeData = 0x40,
+    RemoveTag = KeepTagPos & TagsBeforeData,
+    KeepIndexPos = 0x4,
+    IndexBeforeData = 0x80,
+    PaddingConstraints = 0x8,
+    ForceTagPos = 0x10,
+    ForceIndexPos = 0x20,
+};
+}
+
 /*!
  * \brief Checks "matroska_wave1/test1.mkv".
  */

tests/overallmp3.cpp

@@ -6,6 +6,17 @@
 #include "../id3/id3v1tag.h"
 #include "../id3/id3v2tag.h"
 
+namespace Mp3TestFlags {
+enum TestFlag
+{
+    ForceRewring = 0x1,
+    Id3v2AndId3v1 = 0x2,
+    PaddingConstraints = 0x4,
+    Id3v1Only = 0x8,
+    RemoveTag = Id3v2AndId3v1 & Id3v1Only,
+};
+}
+
 /*!
  * \brief Checks "mtx-test-data/mp3/id3-tag-and-xing-header.mp3"
  */

tests/overallmp4.cpp

@@ -4,6 +4,18 @@
 #include "../mp4/mp4ids.h"
 #include "../mp4/mp4tag.h"
 
+namespace Mp4TestFlags {
+enum TestFlag
+{
+    ForceRewring = 0x1,
+    KeepTagPos = 0x2,
+    TagsBeforeData = 0x10,
+    RemoveTag = KeepTagPos & TagsBeforeData,
+    PaddingConstraints = 0x4,
+    ForceTagPos = 0x8,
+};
+}
+
 /*!
  * \brief Checks "mtx-test-data/mp4/10-DanseMacabreOp.40.m4a"
  */