From ee5294c060a417d61ce0ea9c8127374464d8d4d2 Mon Sep 17 00:00:00 2001 From: jjceresa <32781294+jjceresa@users.noreply.github.com> Date: Wed, 23 Oct 2019 19:56:22 +0200 Subject: [PATCH 1/4] move fluid_profile_ref_var() (#577) --- src/synth/fluid_synth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c index 92d1af3e..c71cf3ba 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c @@ -3827,14 +3827,14 @@ fluid_synth_write_float_LOCAL(fluid_synth_t *synth, int len, double time = fluid_utime(); float cpu_load; + fluid_profile_ref_var(prof_ref); + fluid_return_val_if_fail(synth != NULL, FLUID_FAILED); fluid_return_val_if_fail(lout != NULL, FLUID_FAILED); fluid_return_val_if_fail(rout != NULL, FLUID_FAILED); fluid_return_val_if_fail(len >= 0, FLUID_FAILED); fluid_return_val_if_fail(len != 0, FLUID_OK); // to avoid raising FE_DIVBYZERO below - fluid_profile_ref_var(prof_ref); - fluid_rvoice_mixer_set_mix_fx(synth->eventhandler->mixer, 1); fluid_rvoice_mixer_get_bufs(synth->eventhandler->mixer, &left_in, &right_in); @@ -3985,14 +3985,14 @@ fluid_synth_write_s16(fluid_synth_t *synth, int len, double time = fluid_utime(); float cpu_load; + fluid_profile_ref_var(prof_ref); + fluid_return_val_if_fail(synth != NULL, FLUID_FAILED); fluid_return_val_if_fail(lout != NULL, FLUID_FAILED); fluid_return_val_if_fail(rout != NULL, FLUID_FAILED); fluid_return_val_if_fail(len >= 0, FLUID_FAILED); fluid_return_val_if_fail(len != 0, FLUID_OK); // to avoid raising FE_DIVBYZERO below - fluid_profile_ref_var(prof_ref); - fluid_rvoice_mixer_set_mix_fx(synth->eventhandler->mixer, 1); fluid_rvoice_mixer_get_bufs(synth->eventhandler->mixer, &left_in, &right_in); From 79e5807a14f7ce7a9afd713f06afd3f0c4bae309 Mon Sep 17 00:00:00 2001 From: derselbst Date: Wed, 23 Oct 2019 20:53:52 +0200 Subject: [PATCH 2/4] Mention fluid_sample_set_sound_data() in API docs --- doc/fluidsynth-v20-devdoc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/fluidsynth-v20-devdoc.txt b/doc/fluidsynth-v20-devdoc.txt index 14c8658d..99472775 100644 --- a/doc/fluidsynth-v20-devdoc.txt +++ b/doc/fluidsynth-v20-devdoc.txt @@ -68,6 +68,7 @@ What is FluidSynth? \section NewIn2_1_0 Whats new in 2.1.0? +- fluid_sample_set_sound_data() caused broken sound when copying sample data - smallest allowed chorus speed is now 0.1 Hz (previously 0.29 Hz) \section NewIn2_0_7 Whats new in 2.0.7? From 585396d36e05d6f23a0fed9a6b14134c8a0d90d2 Mon Sep 17 00:00:00 2001 From: derselbst Date: Wed, 23 Oct 2019 21:00:20 +0200 Subject: [PATCH 3/4] Bump version to 2.1.0 RC1 --- CMakeLists.txt | 6 +++--- doc/Doxyfile | 2 +- doc/fluidsynth-v20-devdoc.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00791921..d17a706c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,8 @@ set ( PACKAGE "fluidsynth" ) # FluidSynth package version set ( FLUIDSYNTH_VERSION_MAJOR 2 ) -set ( FLUIDSYNTH_VERSION_MINOR 0 ) -set ( FLUIDSYNTH_VERSION_MICRO 7 ) +set ( FLUIDSYNTH_VERSION_MINOR 1 ) +set ( FLUIDSYNTH_VERSION_MICRO 0 ) set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" ) set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" ) @@ -44,7 +44,7 @@ set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" ) # This is not exactly the same algorithm as the libtool one, but the results are the same. set ( LIB_VERSION_CURRENT 2 ) set ( LIB_VERSION_AGE 2 ) -set ( LIB_VERSION_REVISION 0 ) +set ( LIB_VERSION_REVISION 1 ) set ( LIB_VERSION_INFO "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" ) diff --git a/doc/Doxyfile b/doc/Doxyfile index c5920d14..8c8481b1 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = libfluidsynth -PROJECT_NUMBER = 2.0.7 +PROJECT_NUMBER = 2.1.0RC OUTPUT_DIRECTORY = api CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/fluidsynth-v20-devdoc.txt b/doc/fluidsynth-v20-devdoc.txt index 99472775..f6be4916 100644 --- a/doc/fluidsynth-v20-devdoc.txt +++ b/doc/fluidsynth-v20-devdoc.txt @@ -8,8 +8,8 @@ \author David Henningsson \author Tom Moebert \author Copyright © 2003-2019 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert -\version Revision 2.0.7 -\date 2019-09-25 +\version Revision 2.1.0RC1 +\date 2019-10-23 All the source code examples in this document are in the public domain; you can use them as you please. This document is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ . The FluidSynth library is distributed under the GNU Lesser General Public License. A copy of the GNU Lesser General Public License is contained in the FluidSynth package; if not, visit http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. From 881eb9b0802bdbe9abdf3419c3fa9872a4f246b4 Mon Sep 17 00:00:00 2001 From: derselbst Date: Wed, 23 Oct 2019 21:16:05 +0200 Subject: [PATCH 4/4] Mention new audio drivers in API docs --- doc/fluidsynth-v20-devdoc.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/fluidsynth-v20-devdoc.txt b/doc/fluidsynth-v20-devdoc.txt index f6be4916..a65827ca 100644 --- a/doc/fluidsynth-v20-devdoc.txt +++ b/doc/fluidsynth-v20-devdoc.txt @@ -70,6 +70,11 @@ What is FluidSynth? - fluid_sample_set_sound_data() caused broken sound when copying sample data - smallest allowed chorus speed is now 0.1 Hz (previously 0.29 Hz) +- the following audio drivers were added: + - opensles + - oboe + - sdl2 + - waveout \section NewIn2_0_7 Whats new in 2.0.7? @@ -243,6 +248,7 @@ Creating the audio driver is straightforward: set the audio.driver - dart: DART sound driver (OS/2) - opensles: OpenSL ES (Android) - oboe: Oboe (Android) +- waveout: Microsoft WaveOut, alternative to DirectSound (Windows CE x86, Windows Mobile 2003 for ARMv5, Windows 98 SE, Windows NT 4.0, Windows XP and later) - file: Driver to output audio to a file - sdl2*: Simple DirectMedia Layer (Linux, Windows, Mac OS X, iOS, Android, FreeBSD, Haiku, etc.)