Improved MIDI file Player UI.

Fixed MML Serializer can not deserialize "," separator.
110-kenichi · Nov 7, 2020 · 6ebf3f5 · 6ebf3f5
1 parent e79105f
commit 6ebf3f5
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/src/mamidimemo/Gui/FMEditor/RegisterContainerBase.cs b/src/mamidimemo/Gui/FMEditor/RegisterContainerBase.cs
@@ -11,6 +11,7 @@
 using zanac.MAmidiMEmo.Instruments;
 using zanac.MAmidiMEmo.ComponentModel;
 using System.Reflection;
+using System.Collections;
 
 namespace zanac.MAmidiMEmo.Gui.FMEditor
 {
@@ -206,7 +207,11 @@ public static void DeserializeProps<T>(T obj, string serializeData, params strin
             try
             {
                 serializeData = serializeData.Replace("\r", "").Replace("\n", "");
-                var vals = serializeData.Split(new char[] { ',', ' ', '\t' }).GetEnumerator();
+                IEnumerator vals = null;
+                if (serializeData.Contains(','))
+                    vals = serializeData.Split(new char[] { ',' }).GetEnumerator();
+                else
+                    vals = serializeData.Split(new char[] { ' ', '\t' }).GetEnumerator();
                 foreach (string m in props)
                 {
                     if (!vals.MoveNext())

diff --git a/src/mamidimemo/Gui/FormMain.Designer.cs b/src/mamidimemo/Gui/FormMain.Designer.cs
diff --git a/src/mamidimemo/Gui/FormMain.cs b/src/mamidimemo/Gui/FormMain.cs
@@ -1407,12 +1407,18 @@ private void MidiManager_MidiEventReceived(object sender, MidiEvent e)
         {
             if (e.EventType == MidiEventType.NoteOn)
             {
-                NoteOnEvent noe = (NoteOnEvent)e;
-                if (noe.Velocity != 0)
+                NoteOnEvent noe = e as NoteOnEvent;
+                if (noe != null && noe.Velocity != 0)
                 {
                     lock (chNoteOnData)
                         chNoteOnData[noe.Channel] = noe.Velocity;
                 }
+                TaggedNoteOnEvent tnoe = e as TaggedNoteOnEvent;
+                if (tnoe != null && tnoe.Velocity != 0)
+                {
+                    lock (chNoteOnData)
+                        chNoteOnData[tnoe.Channel] = tnoe.Velocity;
+                }
             }
         }
 

diff --git a/src/mamidimemo/instruments/Chips/YM2612.cs b/src/mamidimemo/instruments/Chips/YM2612.cs
@@ -1242,7 +1242,8 @@ public string MmlSerializeData
                 set
                 {
                     SimpleSerializer.DeserializeProps(this, value,
-                           nameof(ALG),
+
+                        nameof(ALG),
                         nameof(FB),
 
                         "Ops[0].AR",

diff --git a/src/mamidimemo/instruments/SimpleSerializer.cs b/src/mamidimemo/instruments/SimpleSerializer.cs
@@ -1,5 +1,6 @@
 // copyright-holders:K.Ito
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -29,7 +30,7 @@ public static string SerializeProps<T>(T obj, params string[] props)
                         sb.Append(",");
                     var f = getPropertyInfo(obj, m);
                     var val = f.Property.GetValue(f.Owner);
-                    if(val != null)
+                    if (val != null)
                         sb.Append(val.ToString());
                 }
             }
@@ -58,7 +59,11 @@ public static void DeserializeProps<T>(T obj, string serializeData, params strin
             try
             {
                 serializeData = serializeData.Replace("\r", "").Replace("\n", "");
-                var vals = serializeData.Split(new char[] { ',', ' ', '\t' }).GetEnumerator();
+                IEnumerator vals = null;
+                if (serializeData.Contains(','))
+                    vals = serializeData.Split(new char[] { ',' }).GetEnumerator();
+                else
+                    vals = serializeData.Split(new char[] { ' ', '\t' }).GetEnumerator();
                 foreach (string m in props)
                 {
                     if (!vals.MoveNext())