From e8be47abb880a06090f36a7305ab0e4f59f0a701 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 14 Sep 2018 22:35:04 -0500
Subject: Add running status to mid2agb

---
 tools/mid2agb/midi.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'tools/mid2agb/midi.cpp')

diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp
index ba5dd654a..7c05c5237 100644
--- a/tools/mid2agb/midi.cpp
+++ b/tools/mid2agb/midi.cpp
@@ -52,6 +52,7 @@ static std::int32_t s_absoluteTime;
 static int s_blockCount = 0;
 static int s_minNote;
 static int s_maxNote;
+static int s_runningStatus = 0;
 
 void Seek(long offset)
 {
@@ -181,19 +182,31 @@ void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& siz
 {
     typeChan = ReadInt8();
 
+    if (typeChan < 0x80 && s_runningStatus != 0)
+    {
+        typeChan = s_runningStatus;
+        Skip(-1);
+    }
+    
     if (typeChan == 0xFF)
     {
         category = MidiEventCategory::Meta;
         size = 0;
     }
+    else if (typeChan >= 0xF8)
+    {
+        category = MidiEventCategory::Invalid;
+    }
     else if (typeChan >= 0xF0)
     {
         category = MidiEventCategory::SysEx;
         size = 0;
+        s_runningStatus = 0;
     }
     else if (typeChan >= 0x80)
     {
         category = MidiEventCategory::Control;
+        s_runningStatus = typeChan;
 
         switch (typeChan >> 4)
         {
-- 
cgit v1.2.3


From 3028fdc353447be5b36a5bee526ffe3ee696a62a Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sat, 15 Sep 2018 15:49:31 -0500
Subject: Update mid2agb source

Credit to @camthesaxman
---
 tools/mid2agb/midi.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'tools/mid2agb/midi.cpp')

diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp
index 7c05c5237..09480e139 100644
--- a/tools/mid2agb/midi.cpp
+++ b/tools/mid2agb/midi.cpp
@@ -52,7 +52,7 @@ static std::int32_t s_absoluteTime;
 static int s_blockCount = 0;
 static int s_minNote;
 static int s_maxNote;
-static int s_runningStatus = 0;
+static int s_runningStatus;
 
 void Seek(long offset)
 {
@@ -171,6 +171,7 @@ void StartTrack()
 {
     Seek(s_trackDataStart);
     s_absoluteTime = 0;
+    s_runningStatus = 0;
 }
 
 void SkipEventData()
@@ -182,20 +183,18 @@ void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& siz
 {
     typeChan = ReadInt8();
 
-    if (typeChan < 0x80 && s_runningStatus != 0)
+    if (typeChan < 0x80)
     {
+        // If data byte was found, use the running status.
+        ungetc(typeChan, g_inputFile);
         typeChan = s_runningStatus;
-        Skip(-1);
     }
-    
+
     if (typeChan == 0xFF)
     {
         category = MidiEventCategory::Meta;
         size = 0;
-    }
-    else if (typeChan >= 0xF8)
-    {
-        category = MidiEventCategory::Invalid;
+        s_runningStatus = 0;
     }
     else if (typeChan >= 0xF0)
     {
@@ -206,7 +205,6 @@ void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& siz
     else if (typeChan >= 0x80)
     {
         category = MidiEventCategory::Control;
-        s_runningStatus = typeChan;
 
         switch (typeChan >> 4)
         {
@@ -218,6 +216,7 @@ void DetermineEventCategory(MidiEventCategory& category, int& typeChan, int& siz
             size = 2;
             break;
         }
+        s_runningStatus = typeChan;
     }
     else
     {
@@ -434,7 +433,10 @@ bool CheckNoteEnd(Event& event)
 
 void FindNoteEnd(Event& event)
 {
+    // Save the current file position and running status
+    // which get modified by CheckNoteEnd.
     long startPos = ftell(g_inputFile);
+    int savedRunningStatus = s_runningStatus;
 
     event.param2 = 0;
 
@@ -442,6 +444,7 @@ void FindNoteEnd(Event& event)
         ;
 
     Seek(startPos);
+    s_runningStatus = savedRunningStatus;
 }
 
 bool ReadTrackEvent(Event& event)
-- 
cgit v1.2.3


From ef95a132885280dc15848ef6bc6081e0cce35c7e Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sun, 23 Sep 2018 23:37:47 -0500
Subject: Fix compression score lower limit

---
 tools/mid2agb/midi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/mid2agb/midi.cpp')

diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp
index 09480e139..c7a4389b9 100644
--- a/tools/mid2agb/midi.cpp
+++ b/tools/mid2agb/midi.cpp
@@ -900,7 +900,7 @@ void Compress(std::vector<Event>& events)
                 return;
         }
 
-        if (CalculateCompressionScore(events, i) >= 6)
+        if (CalculateCompressionScore(events, i) > 6)
         {
             CompressWholeNote(events, i);
         }
-- 
cgit v1.2.3