WIP

exe/midi-info.cpp

@@ -71,10 +71,8 @@ int main(int argc, const char *argv[]) {
 
     midi_file m;
 
-    Status ret = parseMidiFile(inputFile.c_str(), m);
-
-    if (ret != OK) {
-        return ret;
+    if (parseMidiFile(inputFile.c_str(), m) != OK) {
+        return ERR;
     }
 
     auto info = midiFileInfo(m);

exe/tbt-converter.cpp

@@ -158,26 +158,20 @@ int main(int argc, const char *argv[]) {
 
     tbt_file t;
 
-    Status ret = parseTbtFile(inputFile.c_str(), t);
-
-    if (ret != OK) {
-        return ret;
+    if (parseTbtFile(inputFile.c_str(), t) != OK) {
+        return ERR;
     }
 
     LOGI("exporting...");
 
     midi_file m;
 
-    ret = convertToMidi(t, opts, m);
-
-    if (ret != OK) {
-        return ret;
+    if (convertToMidi(t, opts, m) != OK) {
+        return ERR;
     }
 
-    ret = exportMidiFile(m, outputFile.c_str());
-
-    if (ret != OK) {
-        return ret;
+    if (exportMidiFile(m, outputFile.c_str()) != OK) {
+        return ERR;
     }
 
     LOGI("finished!");

exe/tbt-info.cpp

@@ -70,10 +70,8 @@ int main(int argc, const char *argv[]) {
 
     tbt_file t;
 
-    Status ret = parseTbtFile(inputFile.c_str(), t);
-
-    if (ret != OK) {
-        return ret;
+    if (parseTbtFile(inputFile.c_str(), t) != OK) {
+        return ERR;
     }
 
 #ifndef NDEBUG

exe/tbt-printer.cpp

@@ -90,10 +90,8 @@ int main(int argc, const char *argv[]) {
 
     LOGI("parsing...");
 
-    Status ret = parseTbtFile(inputFile.c_str(), t);
-
-    if (ret != OK) {
-        return ret;
+    if (parseTbtFile(inputFile.c_str(), t) != OK) {
+        return ERR;
     }
 
     LOGI("printing...");
@@ -102,10 +100,8 @@ int main(int argc, const char *argv[]) {
 
     auto buf = std::vector<uint8_t>(tab.begin(), tab.end());
 
-    ret = saveFile(outputFile.c_str(), buf);
-
-    if (ret != OK) {
-        return ret;
+    if (saveFile(outputFile.c_str(), buf) != OK) {
+        return ERR;
     }
 
     LOGI("finished!");

include/tbt-parser/rational.h

@@ -73,3 +73,19 @@ class rational {
 	rational floor() const;
 	rational round() const;
 };
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

include/tbt-parser/tbt-parser-util.h

@@ -102,3 +102,8 @@ uint8_t width(int a);
 
 
 
+
+
+
+
+

include/tbt-parser/tbt.h

@@ -71,3 +71,8 @@ const std::array<int8_t, 6> OPEN_STRING_TO_MIDI_NOTE_LE6A = {
 
 
 
+
+
+
+
+

lib/alternate-time-regions.inl

@@ -17,6 +17,10 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+#ifdef TAG
+#error alternate-time-regions.inl is being included where TAG is already defined
+#endif // TAG
+
 #define TAG "alternate-time-regions"
 
 
@@ -43,10 +47,8 @@ parseAlternateTimeRegionsMapList(
 
             std::vector<uint8_t> deltaList;
 
-            Status ret = parseDeltaListChunk(it, end, deltaList);
-
-            if (ret != OK) {
-                return ret;
+            if (parseDeltaListChunk(it, end, deltaList) != OK) {
+                return ERR;
             }
 
             alternateTimeRegionsDeltaListAcc.insert(
@@ -55,10 +57,8 @@ parseAlternateTimeRegionsMapList(
                 deltaList.cend()
             );
 
-            ret = computeDeltaListCount(deltaList, &dsqCount);
-
-            if (ret != OK) {
-                return ret;
+            if (computeDeltaListCount(deltaList, &dsqCount) != OK) {
+                return ERR;
             }
 
             CHECK(dsqCount <= 2 * trackSpaceCount, "unhandled");
@@ -78,7 +78,7 @@ parseAlternateTimeRegionsMapList(
         );
 
         if (ret != OK) {
-            return ret;
+            return ERR;
         }
 
         rational alternateTimeRegionsCorrection = 0;

lib/bar-lines.inl

@@ -17,6 +17,10 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+#ifdef TAG
+#error bar-lines.inl is being included where TAG is already defined
+#endif // TAG
+
 #define TAG "bar-lines"
 
 
@@ -44,10 +48,8 @@ parseBarLinesMap(
 
         std::vector<std::array<uint8_t, 6> > parts;
 
-        Status ret = partitionInto<6>(data, parts);
-
-        if (ret != OK) {
-            return ret;
+        if (partitionInto<6>(data, parts) != OK) {
+            return ERR;
         }
 
         out.body.barLinesSpaceCount = 0;
@@ -84,18 +86,14 @@ parseBarLinesMap(
 
             std::vector<uint8_t> deltaList;
 
-            Status ret = parseDeltaListChunk(it, end, deltaList);
-
-            if (ret != OK) {
-                return ret;
+            if (parseDeltaListChunk(it, end, deltaList) != OK) {
+                return ERR;
             }
 
             barLinesDeltaListAcc.insert(barLinesDeltaListAcc.end(), deltaList.cbegin(), deltaList.cend());
 
-            ret = computeDeltaListCount(deltaList, &sqCount);
-
-            if (ret != OK) {
-                return ret;
+            if (computeDeltaListCount(deltaList, &sqCount) != OK) {
+                return ERR;
             }
 
             CHECK(sqCount <= barLinesSpaceCount, "unhandled");
@@ -105,7 +103,11 @@ parseBarLinesMap(
             }
         }
 
-        Status ret = expandDeltaList<1>(barLinesDeltaListAcc, barLinesSpaceCount, 0, out.body.barLinesMap);
+        Status ret = expandDeltaList<1>(
+            barLinesDeltaListAcc,
+            barLinesSpaceCount,
+            0,
+            out.body.barLinesMap);
 
         if (ret != OK) {
             return ret;

lib/body.inl

@@ -17,6 +17,10 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+#ifdef TAG
+#error body.inl is being included where TAG is already defined
+#endif // TAG
+
 #define TAG "body"
 
 
@@ -36,10 +40,8 @@ parseBody(
     // parse bar lines
     //
 
-    Status ret = parseBarLinesMap<VERSION, tbt_file_t>(it, end, out);
-
-    if (ret != OK) {
-        return ret;
+    if (parseBarLinesMap<VERSION, tbt_file_t>(it, end, out) != OK) {
+        return ERR;
     }
 
 
@@ -53,6 +55,8 @@ parseBody(
     // parse notes
     //
 
+    Status ret;
+
     if constexpr (0x6b <= VERSION) {
 
         ret = parseNotesMapList<VERSION, tbt_file_t, 8>(it, end, out);
@@ -63,7 +67,7 @@ parseBody(
     }
 
     if (ret != OK) {
-        return ret;
+        return ERR;
     }
 
     //
@@ -72,10 +76,8 @@ parseBody(
 
     if constexpr (HASALTERNATETIMEREGIONS) {
 
-        ret = parseAlternateTimeRegionsMapList<VERSION, tbt_file_t>(it, end, out);
-
-        if (ret != OK) {
-            return ret;
+        if (parseAlternateTimeRegionsMapList<VERSION, tbt_file_t>(it, end, out) != OK) {
+            return ERR;
         }
     }
 
@@ -85,10 +87,8 @@ parseBody(
 
     if constexpr (0x71 <= VERSION) {
 
-        ret = parseTrackEffectChangesMapList<VERSION, tbt_file_t>(it, end, out);
-
-        if (ret != OK) {
-            return ret;
+        if (parseTrackEffectChangesMapList<VERSION, tbt_file_t>(it, end, out) != OK) {
+            return ERR;
         }
     }
 

lib/expanddeltalist.inl

@@ -17,6 +17,10 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+#ifdef TAG
+#error expandDeltaList.inl is being included where TAG is already defined
+#endif // TAG
+
 #define TAG "expandDeltaList"
 
 
@@ -35,10 +39,8 @@ expandDeltaList(
 
     std::vector<std::array<uint8_t, 2> > parts;
 
-    Status ret = partitionInto<2>(deltaList, parts);
-
-    if (ret != OK) {
-        return ret;
+    if (partitionInto<2>(deltaList, parts) != OK) {
+        return ERR;
     }
 
     std::vector<std::vector<std::array<uint8_t, 2> > > split;

lib/last-found.inl

@@ -17,7 +17,11 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-#define TAG "last_found"
+#ifdef TAG
+#error last-found.inl is being included where TAG is already defined
+#endif // TAG
+
+#define TAG "last-found"
 
 
 //

lib/metadata.inl

@@ -17,6 +17,10 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+#ifdef TAG
+#error metadata.inl is being included where TAG is already defined
+#endif // TAG
+
 #define TAG "metadata"