From a80fc811727c1a865df04694a4ed3d9b7786b7a0 Mon Sep 17 00:00:00 2001 From: bree Date: Thu, 27 Feb 2025 17:24:50 +0100 Subject: [PATCH] Small fixes, updated readme --- OmniConverter/Directory.Build.props | 2 +- .../Extensions/Audio/Renderers/FluidSynthRenderer.cs | 5 ++++- OmniConverter/Forms/MainWindow.axaml.cs | 2 +- OmniConverter/OmniConverter.csproj | 4 ++-- README.md | 4 ++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/OmniConverter/Directory.Build.props b/OmniConverter/Directory.Build.props index 9774105..ebe90a5 100644 --- a/OmniConverter/Directory.Build.props +++ b/OmniConverter/Directory.Build.props @@ -1,5 +1,5 @@ - 1.0.0.51 + 1.0.0.77 \ No newline at end of file diff --git a/OmniConverter/Extensions/Audio/Renderers/FluidSynthRenderer.cs b/OmniConverter/Extensions/Audio/Renderers/FluidSynthRenderer.cs index 64070a2..dd2fe01 100644 --- a/OmniConverter/Extensions/Audio/Renderers/FluidSynthRenderer.cs +++ b/OmniConverter/Extensions/Audio/Renderers/FluidSynthRenderer.cs @@ -57,6 +57,7 @@ public class FluidSynthRenderer : AudioRenderer { public Synth? handle { get; private set; } = null; private bool noMoreData = false; + private bool noFx = false; private List _managedSfArray = []; @@ -108,6 +109,8 @@ public FluidSynthRenderer(FluidSynthEngine fluidsynth) : base(fluidsynth, false) handle.Gain = (float)tmp.Synth.Volume; handle.SetInterpolationMethod(-1, interp); + noFx = _cachedSettings.Synth.DisableEffects; + // FluidSynth "thread-safe API" moment lock (reference.SFLock) { @@ -175,7 +178,7 @@ public override unsafe int Read(float[] buffer, int offset, long delta, int coun { var offsetBuff = buff + offset; - handle.Process(count / 2, 2, bufPtr, 2, bufPtr); + handle.Process(count / 2, noFx ? 0 : 2, noFx ? null : bufPtr, 2, bufPtr); for (int i = 0; i < count / 2; i++) { diff --git a/OmniConverter/Forms/MainWindow.axaml.cs b/OmniConverter/Forms/MainWindow.axaml.cs index 88a7ffe..09562a3 100644 --- a/OmniConverter/Forms/MainWindow.axaml.cs +++ b/OmniConverter/Forms/MainWindow.axaml.cs @@ -225,7 +225,7 @@ private void MIDILocation(object? sender, RoutedEventArgs e) MIDI[] list = new MIDI[MIDIListView.SelectedItems.Count]; MIDIListView.SelectedItems.CopyTo(list, 0); - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { Process.Start("explorer.exe", $"/select,\"{list[0].Path}\""); } diff --git a/OmniConverter/OmniConverter.csproj b/OmniConverter/OmniConverter.csproj index bf7b740..270cd1a 100644 --- a/OmniConverter/OmniConverter.csproj +++ b/OmniConverter/OmniConverter.csproj @@ -1,8 +1,8 @@  true - true - link + true + link WinExe enable true diff --git a/README.md b/README.md index d79f531..c684bbf 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ FFMpegCore: https://github.com/rosenbjerg/FFMpegCore
ManagedBass: https://github.com/ManagedBass/ManagedBass
+NFluidSynth (This project uses [my fork](https://github.com/KaleidonKep99/nfluidsynth)): https://github.com/atsushieno/nfluidsynth +
MIDIModificationFramework: https://github.com/arduano/MIDIModificationFramework
XSynth: https://github.com/BlackMIDIDevs/xsynth @@ -26,3 +28,5 @@ XSynth: https://github.com/BlackMIDIDevs/xsynth FLParser (This project uses [Kaydax's](https://github.com/Kaydax/FLParser) fork): https://github.com/monadgroup/FLParser
Un4seen's BASS libraries: https://www.un4seen.com/bass.html +
+FluidSynth: https://www.fluidsynth.org