MIDI file converter fixes for type 1 to type 1 conversions

SOACAt · Feb 12, 2016 · 097737f · 097737f
1 parent a90d18d
commit 097737f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/MidiFileConverter/AboutForm.Designer.cs b/MidiFileConverter/AboutForm.Designer.cs
diff --git a/MidiFileConverter/MidiConverter.cs b/MidiFileConverter/MidiConverter.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using NAudio.Utils;
 using NAudio.Midi;
@@ -191,7 +192,7 @@ private void ConvertMidi(MidiFile midiFile, string target, string[] context)
                 if (midiFile.FileFormat == 0)
                     outputTrackCount = 2;
                 else
-                    outputTrackCount = midiFile.Tracks;
+                    outputTrackCount = Math.Max(midiFile.Tracks,2); // at least two tracks because we'll move notes onto track 1 always
             }
 
 
@@ -327,11 +328,8 @@ private void ConvertMidi(MidiFile midiFile, string target, string[] context)
             {
                 if (outputFileType == 1)
                 {
-                    // if we are converting type 0 to type 1 and recreating end markers,
-                    if (midiFile.FileFormat == 0)
-                    {
-                        AppendEndMarker(events[1]);
-                    }
+                    // make sure track 1 has an end track marker
+                    AppendEndMarker(events[1]);
                 }
                 // make sure that track zero has an end track marker
                 AppendEndMarker(events[0]);
@@ -397,20 +395,24 @@ private void ConvertMidi(MidiFile midiFile, string target, string[] context)
 
         private bool HasNotes(IList<MidiEvent> midiEvents)
         {
-            foreach (MidiEvent midiEvent in midiEvents)
-            {
-                if (midiEvent.CommandCode == MidiCommandCode.NoteOn)
-                    return true;
-            }
-            return false;
+            return midiEvents.Any(midiEvent => midiEvent.CommandCode == MidiCommandCode.NoteOn);
+        }
+
+        private bool IsEndTrack(MidiEvent midiEvent)
+        {
+            var meta = midiEvent as MetaEvent;
+            return meta?.MetaEventType == MetaEventType.EndTrack;
         }
 
         private void AppendEndMarker(IList<MidiEvent> eventList)
         {
             long absoluteTime = 0;
+
             if (eventList.Count > 0)
                 absoluteTime = eventList[eventList.Count - 1].AbsoluteTime;
-            eventList.Add(new MetaEvent(MetaEventType.EndTrack, 0, absoluteTime));
+
+            if (!IsEndTrack(eventList.LastOrDefault()))
+                eventList.Add(new MetaEvent(MetaEventType.EndTrack, 0, absoluteTime));
         }
 
         private string CreateEzdName(string[] context)

diff --git a/MidiFileConverter/Properties/AssemblyInfo.cs b/MidiFileConverter/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Mark Heath")]
 [assembly: AssemblyProduct("MIDI File Converter")]
-[assembly: AssemblyCopyright("Copyright © Mark Heath 2007")]
+[assembly: AssemblyCopyright("Copyright © Mark Heath 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,8 +29,8 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.3.10.0")]
-[assembly: AssemblyFileVersion("0.3.10.0")]
+[assembly: AssemblyVersion("0.3.11.0")]
+[assembly: AssemblyFileVersion("0.3.11.0")]
 
 // build 1 29 Oct 2006
 // build 1 is experimental
@@ -73,6 +73,8 @@
 // and converting from type 0 to type 1
 // build 10 5 Apr 2007
 // updated to use new MidiEventCollection
+// build 11 12 Feb 2016
+// ensuring end track markers persent converting type 1 to 1
 
 // revamp help for advanced options