Skip to content

Commit

Permalink
fluidsynth: upgrade 2.1.7 -> 2.2.0
Browse files Browse the repository at this point in the history
The only fallout by API/ABI changes in my world build was meta-games/scummvm.
Fix was sent [1]

fluidsynth 2.2.0
This release breaks ABI compatibility! Refer to the API docs for details.
A C++98 compliant compiler is now required to build fluidsynth (mailing list thread)

New features

    Support loading SoundFonts >2GiB on Windows (openembedded#629)
    Major overhaul of the sequencer and its event queue (openembedded#604)
        Overlapping notes can be handled (openembedded#637)
        Performance improvement, since the event queue no longer blocks the rendering thread
        Time scale is not limited to 1000 anymore and can therefore be used for tempo changes
    The following audio drivers have gained multi-channel support
        DSound (openembedded#667, thanks to @jjceresa)
        WaveOut (openembedded#667, thanks to @jjceresa)
    The WinMIDI driver supports multiple devices (openembedded#677, thanks to @jjceresa)
    Handle GS DT1 SysEx messages for setting whether a channel is used for rhythm part (openembedded#708, thanks to @chirs241097)
    Support use of UTF-8 filenames under Windows (openembedded#718, thanks to @getraid-gg)
    Improved support for overriding tempo of the MIDI player (openembedded#711, openembedded#713, thanks to @jjceresa)
    Handle settings-related commands in user command file before initializing other objects (openembedded#739)
    SoundFont loading has been parallelized (openembedded#746, openembedded#812, requires openMP)
    The Oboe driver has gained a lower latency and other updates (openembedded#740, openembedded#741, openembedded#747)
    WASAPI driver has been added (openembedded#754, thanks to @chirs241097)

General

    Fix race condition in fluid_player_callback (openembedded#783, thanks to @arcln)
    Improvements to LADSPA subsystem (openembedded#795, thanks to @mawe42)

[1] cazfi/meta-games#58

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
schnitzeltony authored and kraj committed Apr 12, 2021
1 parent ca21fbc commit 825604c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
Expand Up @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"

SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
SRCREV = "e2d67ea77237046b703d537aec90620c22f7f629"
SRCREV = "8413c35aca641567baf13e9b16e9839019ebf99d"
S = "${WORKDIR}/git"
PV = "2.1.7"
PV = "2.2.0"

inherit cmake pkgconfig lib_package
Expand Up @@ -17,15 +17,15 @@ Upstream-Status: Submitted [1]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++++++++---------------
src/synth/fluid_synth.c | 69 ++++++++++++++++++++++++++++-------------
1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index 0df620d3..379f8216 100644
index 1eb5d737..6c876efa 100644
--- a/src/synth/fluid_synth.c
+++ b/src/synth/fluid_synth.c
@@ -3306,10 +3306,10 @@ fluid_synth_program_reset(fluid_synth_t *synth)
* Synthesize a block of floating point audio to separate audio buffers (multichannel rendering). First effect channel used by reverb, second for chorus.
@@ -3628,10 +3628,10 @@ fluid_synth_program_reset(fluid_synth_t *synth)
*
* @param synth FluidSynth instance
* @param len Count of audio frames to synthesize
- * @param left Array of float buffers to store left channel of planar audio (as many as \c synth.audio-channels buffers, each of \c len in size)
Expand All @@ -38,8 +38,8 @@ index 0df620d3..379f8216 100644
+ * @param fx_right Since 1.1.7: If not \c NULL, array of float buffers to store right effect channels (size: dito). Since 2.0.3: NULL allowed for array entry
* @return #FLUID_OK on success, #FLUID_FAILED otherwise
*
* @note Should only be called from synthesis thread.
@@ -3386,15 +3386,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
* First effect channel used by reverb, second for chorus.
@@ -3719,15 +3719,27 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
for(i = 0; i < synth->audio_channels; i++)
{
#ifdef WITH_FLOAT
Expand Down Expand Up @@ -71,7 +71,7 @@ index 0df620d3..379f8216 100644
}

#endif //WITH_FLOAT
@@ -3404,12 +3416,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3737,12 +3749,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
{
#ifdef WITH_FLOAT

Expand All @@ -86,7 +86,7 @@ index 0df620d3..379f8216 100644
{
FLUID_MEMCPY(fx_right[i], &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT + synth->cur], bytes);
}
@@ -3417,7 +3429,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3750,7 +3762,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
#else //WITH_FLOAT
int j;

Expand All @@ -95,7 +95,7 @@ index 0df620d3..379f8216 100644
{
for(j = 0; j < num; j++)
{
@@ -3425,7 +3437,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3758,7 +3770,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
}
}

Expand All @@ -104,7 +104,7 @@ index 0df620d3..379f8216 100644
{
for(j = 0; j < num; j++)
{
@@ -3456,15 +3468,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3789,15 +3801,30 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
for(i = 0; i < synth->audio_channels; i++)
{
#ifdef WITH_FLOAT
Expand Down Expand Up @@ -140,7 +140,7 @@ index 0df620d3..379f8216 100644
}

#endif //WITH_FLOAT
@@ -3474,12 +3501,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3807,12 +3834,12 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
{
#ifdef WITH_FLOAT

Expand All @@ -155,7 +155,7 @@ index 0df620d3..379f8216 100644
{
FLUID_MEMCPY(fx_right[i] + count, &fx_right_in[i * FLUID_BUFSIZE * FLUID_MIXER_MAX_BUFFERS_DEFAULT], bytes);
}
@@ -3487,7 +3514,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3820,7 +3847,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
#else //WITH_FLOAT
int j;

Expand All @@ -164,7 +164,7 @@ index 0df620d3..379f8216 100644
{
for(j = 0; j < num; j++)
{
@@ -3495,7 +3522,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
@@ -3828,7 +3855,7 @@ fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
}
}

Expand Down

0 comments on commit 825604c

Please sign in to comment.