[SCM] fluidsynth/master: New upstream version 1.1.8
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sat Oct 14 04:44:25 UTC 2017
The following commit has been merged in the master branch:
commit 57d236ee3db36ab7f867b220185e7f73d0406ff4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sat Oct 14 06:32:24 2017 +0200
New upstream version 1.1.8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff120d6..aa4154c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,8 @@
# CMake based build system. Pedro Lopez-Cabanillas <plcl at users.sf.net>
+cmake_minimum_required ( VERSION 3.0.2 )
project ( FluidSynth C )
-cmake_minimum_required ( VERSION 2.6.3 )
set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_admin )
# FluidSynth package name
@@ -29,7 +29,7 @@ set ( PACKAGE "fluidsynth" )
# FluidSynth package version
set ( FLUIDSYNTH_VERSION_MAJOR 1 )
set ( FLUIDSYNTH_VERSION_MINOR 1 )
-set ( FLUIDSYNTH_VERSION_MICRO 7 )
+set ( FLUIDSYNTH_VERSION_MICRO 8 )
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 1 )
set ( LIB_VERSION_AGE 6 )
-set ( LIB_VERSION_REVISION 0 )
+set ( LIB_VERSION_REVISION 1 )
set ( LIB_VERSION_INFO
"${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
@@ -70,21 +70,22 @@ option ( BUILD_SHARED_LIBS "Build a shared object or DLL" on )
option ( enable-ipv6 "enable ipv6 support " on )
# Platform specific options
-if ( ${CMAKE_SYSTEM} MATCHES "Linux" )
+if ( CMAKE_SYSTEM MATCHES "Linux" )
option ( enable-ladcca "compile LADCCA support if it is available (deprecated)" off )
option ( enable-lash "compile LASH support (if it is available)" on )
option ( enable-alsa "compile ALSA support (if it is available)" on )
-endif ( ${CMAKE_SYSTEM} MATCHES "Linux" )
+endif ( CMAKE_SYSTEM MATCHES "Linux" )
-if ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+if ( CMAKE_SYSTEM MATCHES "Darwin" )
option ( enable-coreaudio "compile CoreAudio support (if it is available)" on )
option ( enable-coremidi "compile CoreMIDI support (if it is available)" on )
option ( enable-framework "create a Mac OSX style FluidSynth.framework" on )
-endif ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+endif ( CMAKE_SYSTEM MATCHES "Darwin" )
-if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+if ( CMAKE_SYSTEM MATCHES "OS2" )
option ( enable-dart "compile DART support (if it is available)" on )
-endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+ set ( enable-ipv6 off )
+endif ( CMAKE_SYSTEM MATCHES "OS2" )
# Initialize the library directory name suffix.
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
@@ -136,18 +137,25 @@ unset ( FLUID_CPPFLAGS CACHE )
unset ( FLUID_LIBS CACHE )
# Options for the GNU C compiler only
-if ( CMAKE_COMPILER_IS_GNUCC )
+if ( CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
if ( NOT APPLE AND NOT OS2 )
set ( CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
set ( CMAKE_SHARED_LINKER_FLAGS
"${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
endif ( NOT APPLE AND NOT OS2 )
+
+ if ( OS2 )
+ set ( GNUCC_VISIBILITY_FLAG "" )
+ else ( OS2 )
+ set ( GNUCC_VISIBILITY_FLAG "-fvisibility=hidden" )
+ endif ( OS2 )
+
set ( GNUCC_WARNING_FLAGS "-Wall -W -Wpointer-arith -Wbad-function-cast -Wno-cast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement" )
- set ( CMAKE_C_FLAGS_DEBUG "-std=gnu89 -g -fvisibility=hidden -DDEBUG ${GNUCC_WARNING_FLAGS}" )
- set ( CMAKE_C_FLAGS_RELEASE "-std=gnu89 -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -fvisibility=hidden -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
- set ( CMAKE_C_FLAGS_RELWITHDEBINFO "-std=gnu89 -O2 -g -fomit-frame-pointer -funroll-all-loops -finline-functions -fvisibility=hidden -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
-endif ( CMAKE_COMPILER_IS_GNUCC )
+ set ( CMAKE_C_FLAGS_DEBUG "-std=gnu89 -g ${GNUCC_VISIBILITY_FLAG} -DDEBUG ${GNUCC_WARNING_FLAGS}" )
+ set ( CMAKE_C_FLAGS_RELEASE "-std=gnu89 -O2 -fomit-frame-pointer -finline-functions ${GNUCC_VISIBILITY_FLAG} -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
+ set ( CMAKE_C_FLAGS_RELWITHDEBINFO "-std=gnu89 -O2 -g -fomit-frame-pointer -finline-functions ${GNUCC_VISIBILITY_FLAG} -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
+endif ( CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
# Windows
unset ( WINDOWS_SUPPORT CACHE )
@@ -161,8 +169,8 @@ if ( WIN32 )
check_include_files ( "windows.h;mmsystem.h" HAVE_MMSYSTEM_H )
set ( WINDOWS_SUPPORT ${HAVE_WINDOWS_H} )
set ( WINDOWS_LIBS "dsound;winmm;ws2_32" )
+ set ( LIBFLUID_CPPFLAGS "-DFLUIDSYNTH_DLL_EXPORTS" )
set ( FLUID_CPPFLAGS "-DFLUIDSYNTH_NOT_A_DLL" )
- set ( LIBFLUID_CPPFLAGS "${FLUID_CPPFLAGS} -DFLUIDSYNTH_DLL_EXPORTS" )
set ( CMAKE_DEBUG_POSTFIX "_debug" )
# MinGW compiler (a Windows GCC port)
if ( MINGW )
@@ -180,7 +188,7 @@ endif ( WIN32 )
unset ( DART_SUPPORT CACHE )
unset ( DART_LIBS CACHE )
unset ( DART_INCLUDE_DIRS CACHE )
-if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+if ( CMAKE_SYSTEM MATCHES "OS2" )
set ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zbin-files" )
set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Zbin-files" )
if ( enable-dart )
@@ -188,13 +196,13 @@ if ( ${CMAKE_SYSTEM} MATCHES "OS2" )
set ( DART_SUPPORT ${HAVE_DART_H} )
unset ( DART_INCLUDE_DIRS CACHE )
endif ( enable-dart )
-endif ( ${CMAKE_SYSTEM} MATCHES "OS2" )
+endif ( CMAKE_SYSTEM MATCHES "OS2" )
# Solaris / SunOS
-if ( ${CMAKE_SYSTEM} MATCHES "SunOS" )
+if ( CMAKE_SYSTEM MATCHES "SunOS" )
set ( FLUID_LIBS "${FLUID_LIBS};nsl;socket" )
set ( LIBFLUID_LIBS "${LIBFLUID_LIBS};nsl;socket" )
-endif ( ${CMAKE_SYSTEM} MATCHES "SunOS" )
+endif ( CMAKE_SYSTEM MATCHES "SunOS" )
# Apple Mac OSX
unset ( COREAUDIO_SUPPORT CACHE )
@@ -203,7 +211,7 @@ unset ( COREMIDI_SUPPORT CACHE )
unset ( COREMIDI_LIBS CACHE )
unset ( DARWIN CACHE )
unset ( MACOSX_FRAMEWORK CACHE )
-if ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+if ( CMAKE_SYSTEM MATCHES "Darwin" )
set ( DARWIN 1 )
set ( CMAKE_INSTALL_NAME_DIR
${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}${LIB_SUFFIX} )
@@ -224,7 +232,7 @@ if ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
if ( enable-framework )
set ( MACOSX_FRAMEWORK 1 )
endif ( enable-framework )
-endif ( ${CMAKE_SYSTEM} MATCHES "Darwin" )
+endif ( CMAKE_SYSTEM MATCHES "Darwin" )
unset ( HAVE_INETNTOP CACHE )
@@ -472,7 +480,7 @@ if ( UNIX )
COMMAND cp -r doc ${PACKAGE}-${VERSION}
COMMAND cp -r include ${PACKAGE}-${VERSION}
COMMAND cp -r src ${PACKAGE}-${VERSION}
- COMMAND cp AUTHORS ChangeLog CMakeLists.txt ../LICENSE ${PACKAGE}.* INSTALL NEWS README* ../README.md THANKS TODO ${PACKAGE}-${VERSION}
+ COMMAND cp AUTHORS ChangeLog CMakeLists.txt LICENSE ${PACKAGE}.* INSTALL NEWS README* THANKS TODO ${PACKAGE}-${VERSION}
# COMMAND tar -cj --exclude .svn --exclude Makefile.am -f ${PACKAGE}-${VERSION}.tar.bz2 ${PACKAGE}-${VERSION}
# COMMAND tar -cz --exclude .svn --exclude Makefile.am -f ${PACKAGE}-${VERSION}.tar.gz ${PACKAGE}-${VERSION}
# COMMAND zip -qr ${PACKAGE}-${VERSION}.zip ${PACKAGE}-${VERSION} -x '*.svn*' -x '*Makefile.am'
diff --git a/configure.ac b/configure.ac
index 851f78c..3c0e62c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl *** NOTE *** Don't forget to update library version below also
FLUIDSYNTH_VERSION_MAJOR=1
FLUIDSYNTH_VERSION_MINOR=1
-FLUIDSYNTH_VERSION_MICRO=7
+FLUIDSYNTH_VERSION_MICRO=8
FLUIDSYNTH_VERSION=$FLUIDSYNTH_VERSION_MAJOR.$FLUIDSYNTH_VERSION_MINOR.$FLUIDSYNTH_VERSION_MICRO
AC_SUBST(FLUIDSYNTH_VERSION_MAJOR)
@@ -29,7 +29,7 @@ dnl if any interfaces have been added: lt_age++
dnl if any interfaces have been removed/changed (compatibility broken): lt_age=0
m4_define([lt_current], [6])
-m4_define([lt_revision], [0])
+m4_define([lt_revision], [1])
m4_define([lt_age], [6])
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 28a399e..2837b89 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = libfluidsynth
-PROJECT_NUMBER = 1.1.7
+PROJECT_NUMBER = 1.1.8
OUTPUT_DIRECTORY = api
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
diff --git a/doc/fluidsynth-v11-devdoc.txt b/doc/fluidsynth-v11-devdoc.txt
index 1b96382..a82a6b1 100644
--- a/doc/fluidsynth-v11-devdoc.txt
+++ b/doc/fluidsynth-v11-devdoc.txt
@@ -8,8 +8,8 @@
\author David Henningsson
\author Tom Moebert
\author Copyright © 2003-2017 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert
-\version Revision 1.1.7
-\date 2017-09-04
+\version Revision 1.1.8
+\date 2017-10-14
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.
@@ -21,6 +21,7 @@ All the source code examples in this document are in the public domain; you can
- \ref Disclaimer
- \ref Introduction
+- \ref NewIn1_1_8
- \ref NewIn1_1_7
- \ref NewIn1_1_6
- \ref NewIn1_1_5
@@ -65,6 +66,20 @@ What is FluidSynth?
- FluidSynth is open source, in active development. For more details, take a look at http://www.fluidsynth.org
+\section NewIn1_1_8 Whats new in 1.1.8?
+
+Changes in FluidSynth 1.1.8 concerning developers:
+
+- fluid_synth_get_channel_preset() is not deprecated anymore
+- deprecate fluid_synth_get_channel_info()
+- deprecate fluid_synth_set_midi_router()
+- deprecate redundant tuning functions
+- deprecate fluid_gen_set_default_values()
+- deprecate struct _fluid_mod_t, use the respective getter and setter functions
+
+- For a full list of bug fixes, see
+ https://github.com/FluidSynth/fluidsynth/wiki/ChangeLog#fluidsynth-118
+
\section NewIn1_1_7 Whats new in 1.1.7?
Changes in FluidSynth 1.1.7 concerning developers:
diff --git a/doc/fluidsynth.1 b/doc/fluidsynth.1
index 5ca0398..3384fbb 100644
--- a/doc/fluidsynth.1
+++ b/doc/fluidsynth.1
@@ -10,10 +10,10 @@
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU Lesser General Public License
-.\" along with this program; see the file COPYING. If not, write to
+.\" along with this program; see the file LICENSE. If not, write to
.\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
.\"
-.TH FluidSynth 1 "Aug 26, 2010"
+.TH FluidSynth 1 "Oct 14, 2017"
.\" Please update the above date whenever this man page is modified.
.\"
.\" Some roff macros, for reference:
diff --git a/include/fluidsynth/mod.h b/include/fluidsynth/mod.h
index 01857dc..a50c521 100644
--- a/include/fluidsynth/mod.h
+++ b/include/fluidsynth/mod.h
@@ -34,6 +34,8 @@ extern "C" {
/**
* Modulator structure. See SoundFont 2.04 PDF section 8.2.
+ *
+ * @deprecated To be removed from the public API.
*/
struct _fluid_mod_t
{
diff --git a/include/fluidsynth/synth.h b/include/fluidsynth/synth.h
index bee64d4..a0a6f0f 100644
--- a/include/fluidsynth/synth.h
+++ b/include/fluidsynth/synth.h
@@ -102,10 +102,13 @@ FLUIDSYNTH_API int fluid_synth_system_reset(fluid_synth_t* synth);
FLUIDSYNTH_API int fluid_synth_all_notes_off(fluid_synth_t* synth, int chan);
FLUIDSYNTH_API int fluid_synth_all_sounds_off(fluid_synth_t* synth, int chan);
+/**
+ * The midi channel type used by fluid_synth_set_channel_type()
+ */
enum fluid_midi_channel_type
{
- CHANNEL_TYPE_MELODIC = 0,
- CHANNEL_TYPE_DRUM = 1
+ CHANNEL_TYPE_MELODIC = 0, /**< Melodic midi channel */
+ CHANNEL_TYPE_DRUM = 1 /**< Drum midi channel */
};
FLUIDSYNTH_API int fluid_synth_set_channel_type(fluid_synth_t* synth, int chan, int type);
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98f4d99..134f08e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -266,8 +266,7 @@ if ( MACOSX_FRAMEWORK )
elseif ( OS2 )
set_target_properties ( libfluidsynth
PROPERTIES
- OUTPUT_NAME "fluidsyn"
- ARCHIVE_OUTPUT_NAME "fluidsynth"
+ OUTPUT_NAME "fluidsynth"
VERSION ${LIB_VERSION_INFO}
SOVERSION ${LIB_VERSION_CURRENT}
)
diff --git a/src/bindings/fluid_filerenderer.c b/src/bindings/fluid_filerenderer.c
index bbe903b..01fa8fe 100644
--- a/src/bindings/fluid_filerenderer.c
+++ b/src/bindings/fluid_filerenderer.c
@@ -310,6 +310,7 @@ new_fluid_file_renderer(fluid_synth_t* synth)
/**
* Set vbr encoding quality (only available with libsndfile support)
* @param dev File renderer object.
+ * @return #FLUID_OK if the quality has been successfully set, #FLUID_FAILED otherwise
* @since 1.1.7
*/
int
diff --git a/src/fluidsynth.c b/src/fluidsynth.c
index 2799821..07fb182 100644
--- a/src/fluidsynth.c
+++ b/src/fluidsynth.c
@@ -591,14 +591,18 @@ int main(int argc, char** argv)
}
#endif
- /* The 'groups' setting is only relevant for LADSPA operation
+ /* The 'groups' setting is relevant for LADSPA operation and channel mapping
+ * in rvoice_mixer.
* If not given, set number groups to number of audio channels, because
* they are the same (there is nothing between synth output and 'sound card')
*/
if ((audio_groups == 0) && (audio_channels != 0)) {
audio_groups = audio_channels;
}
- fluid_settings_setint(settings, "synth.audio-groups", audio_groups);
+ if (audio_groups != 0)
+ {
+ fluid_settings_setint(settings, "synth.audio-groups", audio_groups);
+ }
if (fast_render) {
midi_in = 0;
@@ -847,7 +851,7 @@ void
print_welcome()
{
printf("FluidSynth version %s\n"
- "Copyright (C) 2000-2012 Peter Hanappe and others.\n"
+ "Copyright (C) 2000-2017 Peter Hanappe and others.\n"
"Distributed under the LGPL license.\n"
"SoundFont(R) is a registered trademark of E-mu Systems, Inc.\n\n",
FLUIDSYNTH_VERSION);
diff --git a/src/synth/fluid_gen.c b/src/synth/fluid_gen.c
index 996e2f3..afabc38 100644
--- a/src/synth/fluid_gen.c
+++ b/src/synth/fluid_gen.c
@@ -92,7 +92,8 @@ fluid_gen_info_t fluid_gen_info[] = {
/**
* Set an array of generators to their default values.
* @param gen Array of generators (should be #GEN_LAST in size).
- * @return Always returns 0
+ * @return Always returns #FLUID_OK
+ * @deprecated Will be removed from the public API in a future release, because there is no current usecase for it.
*/
int
fluid_gen_set_default_values(fluid_gen_t* gen)
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index c44baf8..e4f110d 100644
--- a/src/synth/fluid_synth.c
+++ b/src/synth/fluid_synth.c
@@ -3619,11 +3619,10 @@ fluid_synth_get_sfont_by_name(fluid_synth_t* synth, const char *name)
* Get active preset on a MIDI channel.
* @param synth FluidSynth instance
* @param chan MIDI channel number (0 to MIDI channel count - 1)
- * @return Preset or NULL if no preset active on channel
- * @deprecated fluid_synth_get_channel_info() should replace most use cases.
+ * @return Preset or NULL if no preset active on \c chan
*
* @note Should only be called from within synthesis thread, which includes
- * SoundFont loader preset noteon methods. Not thread safe otherwise.
+ * SoundFont loader preset noteon methods. Not thread safe otherwise.
*/
fluid_preset_t *
fluid_synth_get_channel_preset(fluid_synth_t* synth, int chan)
@@ -3644,6 +3643,8 @@ fluid_synth_get_channel_preset(fluid_synth_t* synth, int chan)
* @param chan MIDI channel number (0 to MIDI channel count - 1)
* @param info Caller supplied structure to fill with preset information
* @return #FLUID_OK on success, #FLUID_FAILED otherwise
+ * @deprecated Provides redundant functionality that can be achieved with
+ * fluid_synth_get_channel_preset() or fluid_synth_get_program().
* @since 1.1.1
*/
int
@@ -4308,12 +4309,14 @@ fluid_synth_update_voice_tuning_LOCAL (fluid_synth_t *synth, fluid_channel_t *ch
* @param name Label name for this tuning
* @param pitch Array of pitch values (length of 128, each value is number of
* cents, for example normally note 0 is 0.0, 1 is 100.0, 60 is 6000.0, etc).
- * Pass NULL to create a well-tempered (normal) scale.
+ * Pass NULL to create a equal tempered (normal) scale.
* @return FLUID_OK on success, FLUID_FAILED otherwise
*
* @note Tuning is not applied in realtime to existing notes of the replaced
* tuning (if any), use fluid_synth_activate_key_tuning() instead to specify
* this behavior.
+ *
+ * @deprecated Use fluid_synth_activate_key_tuning(synth, bank, prog, name, pitch, FALSE) instead.
*/
int
fluid_synth_create_key_tuning(fluid_synth_t* synth, int bank, int prog,
@@ -4330,7 +4333,7 @@ fluid_synth_create_key_tuning(fluid_synth_t* synth, int bank, int prog,
* @param name Label name for this tuning
* @param pitch Array of pitch values (length of 128, each value is number of
* cents, for example normally note 0 is 0.0, 1 is 100.0, 60 is 6000.0, etc).
- * Pass NULL to create a well-tempered (normal) scale.
+ * Pass NULL to create a equal tempered (normal) scale.
* @param apply TRUE to apply new tuning in realtime to existing notes which
* are using the replaced tuning (if any), FALSE otherwise
* @return FLUID_OK on success, FLUID_FAILED otherwise
@@ -4376,6 +4379,8 @@ fluid_synth_activate_key_tuning(fluid_synth_t* synth, int bank, int prog,
* @note Tuning is not applied in realtime to existing notes of the replaced
* tuning (if any), use fluid_synth_activate_octave_tuning() instead to specify
* this behavior.
+ *
+ * @deprecated Use fluid_synth_activate_octave_tuning(synth, bank, prog, name, pitch, FALSE) instead.
*/
int
fluid_synth_create_octave_tuning(fluid_synth_t* synth, int bank, int prog,
@@ -4439,7 +4444,7 @@ fluid_synth_activate_octave_tuning(fluid_synth_t* synth, int bank, int prog,
* @return FLUID_OK on success, FLUID_FAILED otherwise
*
* @note Prior to version 1.1.0 it was an error to specify a tuning that didn't
- * already exist. Starting with 1.1.0, the default equal tempered scale will be
+ * already exist. Starting with 1.1.0, the default equal tempered scale will be
* used as a basis, if no tuning exists for the given bank and prog.
*/
int
@@ -4491,8 +4496,10 @@ fluid_synth_tune_notes(fluid_synth_t* synth, int bank, int prog,
* should cause existing notes to update.
*
* @note Prior to version 1.1.0 it was an error to select a tuning that didn't
- * already exist. Starting with 1.1.0, a default equal tempered scale will be
+ * already exist. Starting with 1.1.0, a default equal tempered scale will be
* created, if no tuning exists for the given bank and prog.
+ *
+ * @deprecated Use fluid_synth_activate_tuning(synth, chan, bank, prog, FALSE) instead.
*/
int
fluid_synth_select_tuning(fluid_synth_t* synth, int chan, int bank, int prog)
@@ -4576,7 +4583,7 @@ fluid_synth_set_tuning_LOCAL (fluid_synth_t *synth, int chan,
}
/**
- * Clear tuning scale on a MIDI channel (set it to the default well-tempered scale).
+ * Clear tuning scale on a MIDI channel (set it to the default equal tempered scale).
* @param synth FluidSynth instance
* @param chan MIDI channel number (0 to MIDI channel count - 1)
* @return FLUID_OK on success, FLUID_FAILED otherwise
@@ -4584,6 +4591,8 @@ fluid_synth_set_tuning_LOCAL (fluid_synth_t *synth, int chan,
* @note This function does NOT activate tuning change in realtime, use
* fluid_synth_deactivate_tuning() instead to specify whether tuning change
* should cause existing notes to update.
+ *
+ * @deprecated Use fluid_synth_deactivate_tuning(synth, chan, FALSE) instead.
*/
int
fluid_synth_reset_tuning(fluid_synth_t* synth, int chan)
@@ -4731,6 +4740,7 @@ fluid_synth_get_settings(fluid_synth_t* synth)
* @param name Name of setting parameter
* @param str Value to assign to the setting
* @return FLUID_OK on success, FLUID_FAILED otherwise
+ * @deprecated Use fluid_settings_setstr() in combination with fluid_synth_get_settings() instead.
*/
int
fluid_synth_setstr(fluid_synth_t* synth, const char* name, const char* str)
@@ -4747,6 +4757,7 @@ fluid_synth_setstr(fluid_synth_t* synth, const char* name, const char* str)
* @param name Name of setting parameter
* @param str Location to store a pointer to the newly allocated string value
* @return FLUID_OK on success, FLUID_FAILED otherwise
+ * @deprecated Use fluid_settings_dupstr() in combination with fluid_synth_get_settings() instead.
*
* The returned string is owned by the caller and should be freed with free()
* when finished with it.
@@ -4767,6 +4778,7 @@ fluid_synth_dupstr(fluid_synth_t* synth, const char* name, char** str)
* @param name Name of setting parameter
* @param val Value to assign to the setting
* @return FLUID_OK on success, FLUID_FAILED otherwise
+ * @deprecated Use fluid_settings_setnum() in combination with fluid_synth_get_settings() instead.
*/
int
fluid_synth_setnum(fluid_synth_t* synth, const char* name, double val)
@@ -4783,6 +4795,7 @@ fluid_synth_setnum(fluid_synth_t* synth, const char* name, double val)
* @param name Name of setting parameter
* @param val Location to store the current value of the setting
* @return FLUID_OK on success, FLUID_FAILED otherwise
+ * @deprecated Use fluid_settings_getnum() in combination with fluid_synth_get_settings() instead.
*/
int
fluid_synth_getnum(fluid_synth_t* synth, const char* name, double* val)
@@ -4799,6 +4812,7 @@ fluid_synth_getnum(fluid_synth_t* synth, const char* name, double* val)
* @param name Name of setting parameter
* @param val Value to assign to the setting
* @return FLUID_OK on success, FLUID_FAILED otherwise
+ * @deprecated Use fluid_settings_setint() in combination with fluid_synth_get_settings() instead.
*/
int
fluid_synth_setint(fluid_synth_t* synth, const char* name, int val)
@@ -4815,6 +4829,7 @@ fluid_synth_setint(fluid_synth_t* synth, const char* name, int val)
* @param name Name of setting parameter
* @param val Location to store the current value of the setting
* @return FLUID_OK on success, FLUID_FAILED otherwise
+ * @deprecated Use fluid_settings_getint() in combination with fluid_synth_get_settings() instead.
*/
int
fluid_synth_getint(fluid_synth_t* synth, const char* name, int* val)
@@ -4923,6 +4938,7 @@ fluid_synth_get_gen(fluid_synth_t* synth, int chan, int param)
* @param router MIDI router to assign to the synth
*
* @note This should only be done once and prior to using the synth.
+ * @deprecated This function is only used by shell command handler, which will be refactored in a future release.
*/
void
fluid_synth_set_midi_router(fluid_synth_t* synth, fluid_midi_router_t* router)
@@ -5141,7 +5157,7 @@ void fluid_synth_api_exit(fluid_synth_t* synth)
* Set midi channel type
* @param synth FluidSynth instance
* @param chan MIDI channel number (0 to MIDI channel count - 1)
- * @param type CHANNEL_TYPE_MELODIC, or CHANNEL_TYPE_DRUM
+ * @param type MIDI channel type (#fluid_midi_channel_type)
* @return FLUID_OK on success, FLUID_FAILED otherwise
* @since 1.1.4
*/
diff --git a/src/utils/fluid_sys.h b/src/utils/fluid_sys.h
index 06ebcc5..b5034e9 100644
--- a/src/utils/fluid_sys.h
+++ b/src/utils/fluid_sys.h
@@ -265,7 +265,6 @@ typedef GStaticPrivate fluid_private_t;
/* Atomic operations */
#define fluid_atomic_int_inc(_pi) g_atomic_int_inc(_pi)
-#define fluid_atomic_int_add(_pi, _val) g_atomic_int_add(_pi, _val)
#define fluid_atomic_int_get(_pi) g_atomic_int_get(_pi)
#define fluid_atomic_int_set(_pi, _val) g_atomic_int_set(_pi, _val)
#define fluid_atomic_int_dec_and_test(_pi) g_atomic_int_dec_and_test(_pi)
@@ -275,9 +274,13 @@ typedef GStaticPrivate fluid_private_t;
#if GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 30)
#define fluid_atomic_int_exchange_and_add(_pi, _add) \
g_atomic_int_add(_pi, _add)
+#define fluid_atomic_int_add(_pi, _add) \
+ g_atomic_int_add(_pi, _add)
#else
#define fluid_atomic_int_exchange_and_add(_pi, _add) \
g_atomic_int_exchange_and_add(_pi, _add)
+#define fluid_atomic_int_add(_pi, _add) \
+ g_atomic_int_exchange_and_add(_pi, _add)
#endif
#define fluid_atomic_pointer_get(_pp) g_atomic_pointer_get(_pp)
--
fluidsynth packaging
More information about the pkg-multimedia-commits
mailing list