Michel2/mt32-pi
1
0 Fork 0
mirror of https://github.com/dwhinham/mt32-pi.git synced 2026-10-27 06:21:59 +00:00
Code Wiki Activity

Update to FluidSynth v2.2.8

Browse Source
This commit is contained in:
Dale Whinham committed 2022-07-27 00:01:22 +01:00
1 parent 93bdeb8b4d
commit 4a09e36d96
4 files changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGELOG.md
+1
View File
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Update to FluidSynth v2.2.8.
- Updater: `config.txt` is now replaced on update, however the `avoid_warnings` setting is preserved (the only setting that matters to most users).
- Updater: improved error handling.
Makefile
+2 -2
View File
@@ -69,7 +69,7 @@ $(MT32EMUBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done
fluidsynth: $(FLUIDSYNTHBUILDDIR)/.done
$(FLUIDSYNTHBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done
@patch -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.7-circle.patch
@patch -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.8-circle.patch
@export CFLAGS="$(CFLAGS_FOR_TARGET)"
@cmake -B $(FLUIDSYNTHBUILDDIR) \
@@ -121,7 +121,7 @@ clean:
veryclean: clean
# Reverse patches
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.4-minimal-usb-drivers.patch
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.7-circle.patch
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.8-circle.patch
# Clean circle-stdlib
@$(MAKE) -C $(CIRCLESTDLIBHOME) mrproper
external/fluidsynth
Vendored
+1 -1
Submodule external/fluidsynth updated: 1daf078708...7e3fdc9056.
patches/fluidsynth-2.2.7-circle.patch → patches/fluidsynth-2.2.8-circle.patch
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41a61ef3..a0a7bba1 100644
index 5b100edf..a17b77b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -492,6 +492,7 @@ if ( ASTYLE )
@@ -90,7 +90,7 @@ index 26dbac65..7ab9dc09 100644
/**
* Creates a new SoundFont loader.
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index 68ce0965..de9784f3 100644
index 7d058258..8c7d4ac4 100644
--- a/src/synth/fluid_synth.c
+++ b/src/synth/fluid_synth.c
@@ -108,7 +108,9 @@ static int fluid_synth_render_blocks(fluid_synth_t *synth, int blockcount);
@@ -119,7 +119,7 @@ index 68ce0965..de9784f3 100644
if(synth->channel != NULL)
{
@@ -5446,14 +5450,17 @@ fluid_synth_sfont_unref(fluid_synth_t *synth, fluid_sfont_t *sfont)
@@ -5447,14 +5451,17 @@ fluid_synth_sfont_unref(fluid_synth_t *synth, fluid_sfont_t *sfont)
{
FLUID_LOG(FLUID_DBG, "Unloaded SoundFont");
} /* spin off a timer thread to unload the sfont later (SoundFont loader blocked unload) */
@@ -137,7 +137,7 @@ index 68ce0965..de9784f3 100644
/* Callback to continually attempt to unload a SoundFont,
* only if a SoundFont loader blocked the unload operation */
static int
@@ -5471,6 +5478,7 @@ fluid_synth_sfunload_callback(void *data, unsigned int msec)
@@ -5472,6 +5479,7 @@ fluid_synth_sfunload_callback(void *data, unsigned int msec)
return TRUE;
}
}
@@ -145,7 +145,7 @@ index 68ce0965..de9784f3 100644
/**
* Reload a SoundFont. The SoundFont retains its ID and index on the SoundFont stack.
@@ -7568,6 +7576,7 @@ fluid_synth_get_gen(fluid_synth_t *synth, int chan, int param)
@@ -7569,6 +7577,7 @@ fluid_synth_get_gen(fluid_synth_t *synth, int chan, int param)
FLUID_API_RETURN(result);
}
@@ -153,7 +153,7 @@ index 68ce0965..de9784f3 100644
/**
* Handle MIDI event from MIDI router, used as a callback function.
* @param data FluidSynth instance
@@ -7624,6 +7633,7 @@ fluid_synth_handle_midi_event(void *data, fluid_midi_event_t *event)
@@ -7625,6 +7634,7 @@ fluid_synth_handle_midi_event(void *data, fluid_midi_event_t *event)
return FLUID_FAILED;
}