Fixed SysEx for GOOD, thank you @khang06!!!!

BlackMIDIDevs · Feb 26, 2025 · 5db240a · 5db240a
1 parent d28d12e
commit 5db240a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/MIDIModificationFramework b/MIDIModificationFramework
diff --git a/OmniConverter/Directory.Build.props b/OmniConverter/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.0.0.37</VersionPrefix>
+    <VersionPrefix>1.0.0.51</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/OmniConverter/Extensions/Audio/Renderers/BASSRenderer.cs b/OmniConverter/Extensions/Audio/Renderers/BASSRenderer.cs
@@ -296,7 +296,7 @@ public override bool SendCustomFXEvents(int channel, short reverb, short chorus)
         public override void SendEvent(byte[] data)
         {
             var status = data[0];
-            var param1 = data[1];
+            var param1 = data.Length >= 2 ? data[1] : 0;
             var param2 = data.Length >= 3 ? data[2] : 0;
 
             int eventParams;
@@ -307,14 +307,17 @@ public override void SendEvent(byte[] data)
                 case MIDIEventType.NoteOn:
                     if (reference.CachedSettings.Event.FilterVelocity && param2 >= reference.CachedSettings.Event.VelocityLow && param2 <= reference.CachedSettings.Event.VelocityHigh)
                         return;
+
                     if (reference.CachedSettings.Event.FilterKey && (param1 < reference.CachedSettings.Event.KeyLow || param1 > reference.CachedSettings.Event.KeyHigh))
                         return;
+
                     eventParams = param2 << 8 | param1;
                     break;
 
                 case MIDIEventType.NoteOff:
                     if (reference.CachedSettings.Event.FilterKey && (param1 < reference.CachedSettings.Event.KeyLow || param1 > reference.CachedSettings.Event.KeyHigh))
                         return;
+
                     eventParams = param1;
                     break;
 
@@ -339,7 +342,7 @@ public override void SendEvent(byte[] data)
                     break;
 
                 default:
-                    BassMidi.StreamEvents(Handle, MidiEventsMode.Raw, data, data.Length);
+                    BassMidi.StreamEvents(Handle, MidiEventsMode.Raw | MidiEventsMode.NoRunningStatus, data, data.Length);
                     return;
             }
 

diff --git a/OmniConverter/Extensions/Audio/Renderers/FluidSynthRenderer.cs b/OmniConverter/Extensions/Audio/Renderers/FluidSynthRenderer.cs
@@ -223,22 +223,21 @@ public override void SendEvent(byte[] data)
                         {
                             case MIDIEventType.SystemMessageStart:
                                 {
-                                    string sysexbuf = string.Empty;
+                                    byte[] refactor = new byte[data.Length - 2];
+                                    byte[] dummy = new byte[refactor.Length];
 
-                                    foreach (byte ch in data)
-                                        sysexbuf += $"{ch:X}";
-
-                                    try
-                                    {
-                                        if (handle.Sysex(data, null, false))
-                                            Debug.PrintToConsole(Debug.LogType.Message, $"SysEx parsed! >> {sysexbuf}");
-                                    }
-                                    catch
+                                    for (int i = 1; i < data.Length - 1; i++)
+                                        refactor[i - 1] = data[i];
+
+                                    if (!handle.Sysex(refactor, 0, refactor.Length, dummy, 0, dummy.Length))
                                     {
+                                        string sysexbuf = string.Empty;
+
+                                        foreach (byte ch in refactor)
+                                            sysexbuf += $"{ch:X}";
 
                                         Debug.PrintToConsole(Debug.LogType.Error, $"Invalid SysEx! >> {sysexbuf}");
                                     }
-
                                 }
                                 return;
 

diff --git a/OmniConverter/Extensions/MIDI/MIDI.cs b/OmniConverter/Extensions/MIDI/MIDI.cs
@@ -165,6 +165,7 @@ public static List<IEnumerable<MIDIEvent>> GetMetaEvents(IEnumerable<IEnumerable
                             case ProgramChangeEvent pcev:
                             case ChannelPressureEvent cpev:
                             case PitchWheelChangeEvent pwcev:
+                            case SystemExclusiveMessageEvent sysexev:
                                 e.DeltaTime += delta;
                                 delta = 0;
                                 trackMetaEvents.Add(e);

diff --git a/OmniConverter/Extensions/MIDI/MIDIConverter.cs b/OmniConverter/Extensions/MIDI/MIDIConverter.cs
@@ -912,7 +912,7 @@ public void Process(ISampleWriter output, WaveFormat waveFormat, CancellationTok
 
                 if (_midiRenderer != null)
                 {
-                    _midiRenderer.SystemReset();
+                    // _midiRenderer.SystemReset();
 
                     float[] buffer = new float[256 * waveFormat.BlockAlign];
                     long prevWriteTime = 0;
@@ -976,10 +976,10 @@ public void Process(ISampleWriter output, WaveFormat waveFormat, CancellationTok
                             switch (e)
                             {
                                 case ControlChangeEvent ev:
-                                    if (!(_audioRenderer.CachedSettings.Event.OverrideEffects && (ev.Controller == 0x5B || ev.Controller == 0x5D)))
-                                        goto default;
+                                    if (_audioRenderer.CachedSettings.Event.OverrideEffects && (ev.Controller == 0x5B || ev.Controller == 0x5D))
+                                        break;
 
-                                    break;
+                                    goto default;
 
                                 case ProgramChangeEvent:
                                     if (!_audioRenderer.CachedSettings.Event.IgnoreProgramChanges)

diff --git a/OmniConverter/Forms/MainWindow.axaml b/OmniConverter/Forms/MainWindow.axaml
@@ -101,7 +101,7 @@
 						</Grid>
 						<Grid ColumnDefinitions="100, 6*">
 							<Label Grid.Column="0">Length:</Label>
-							<Label Grid.Column="1" Name="InfoLength">-:--.--- (- PPQ)</Label>
+							<Label Grid.Column="1" Name="InfoLength">-:--.--- (-PPQN)</Label>
 						</Grid>
 						<Grid ColumnDefinitions="100, 6*">
 							<Label Grid.Column="0">Tracks:</Label>

diff --git a/OmniConverter/Forms/SettingsWindow.axaml.cs b/OmniConverter/Forms/SettingsWindow.axaml.cs
@@ -194,6 +194,7 @@ private void AudioRendererChanged(object? sender, SelectionChangedEventArgs e)
             switch ((EngineID)SelectedRenderer.SelectedIndex)
             {
                 case EngineID.BASS:
+                case EngineID.FluidSynth:
                     BASS_MaxVoices.Value = Program.Settings.Synth.MaxVoices;
 
                     BASSSettingsPanel.IsVisible = true;

diff --git a/nfluidsynth b/nfluidsynth
+2 −2		NFluidsynth/NFluidsynth.csproj
+4 −4		NFluidsynth/Native/LibFluidsynth.Synth.cs
+15 −0		NFluidsynth/Native/LibFluidsynth.cs
+2 −2		NFluidsynth/Synth.cs