Merge pull request #201 from FluidSynth/1.1.x

merge 1.1.7 into master

.travis.yml

@@ -170,7 +170,6 @@ before_install:
     - eval "${MATRIX_EVAL}"
     
 before_script:
-    - cd fluidsynth
     - mkdir build && cd build
     
 script:

AUTHORS

@@ -1,6 +1,11 @@
 [:Team:]
 Current development team
 
+Tom Moebert
+
+
+Former development team
+
 Josh Green
 Pedro Lopez-Cabanillas
 David Henningsson
@@ -22,7 +27,7 @@ summary of contributions.
 * Peter Hanappe. Initiated the project. files: stuck his nose in all
   files.
 
-* Josh Green is the current maintainer and contributed a lot of code
+* Josh Green is the former maintainer and contributed a lot of code
   directly or indirectly through the Swami and Smurf code base.
   The SoundFont loader is completely based on his code. He also wrote
   the alsa sequencer driver. He made many changes and bug fixes,

CMakeLists.txt

@@ -29,7 +29,7 @@ set ( PACKAGE "fluidsynth" )
 # FluidSynth package version
 set ( FLUIDSYNTH_VERSION_MAJOR 1 )
 set ( FLUIDSYNTH_VERSION_MINOR 1 )
-set ( FLUIDSYNTH_VERSION_MICRO 6 )
+set ( FLUIDSYNTH_VERSION_MICRO 7 )
 set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
 set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
 
@@ -43,8 +43,8 @@ set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
 # if any interfaces have been removed/changed (compatibility broken): AGE=0
 # 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 5 )
-set ( LIB_VERSION_REVISION 2 )
+set ( LIB_VERSION_AGE 6 )
+set ( LIB_VERSION_REVISION 0 )
 set ( LIB_VERSION_INFO
       "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
 
@@ -511,8 +511,8 @@ include ( report )
 # CPack support
 set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "FluidSynth real-time synthesizer" )
 set ( CPACK_PACKAGE_VENDOR "fluidsynth.org" )
-set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/../README.md" )
-set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/../LICENSE" )
+set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
+set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE" )
 set ( CPACK_PACKAGE_VERSION_MAJOR ${FLUIDSYNTH_VERSION_MAJOR} )
 set ( CPACK_PACKAGE_VERSION_MINOR ${FLUIDSYNTH_VERSION_MINOR} )
 set ( CPACK_PACKAGE_VERSION_PATCH ${FLUIDSYNTH_VERSION_MICRO} )

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=6
+FLUIDSYNTH_VERSION_MICRO=7
 FLUIDSYNTH_VERSION=$FLUIDSYNTH_VERSION_MAJOR.$FLUIDSYNTH_VERSION_MINOR.$FLUIDSYNTH_VERSION_MICRO
 
 AC_SUBST(FLUIDSYNTH_VERSION_MAJOR)
@@ -29,8 +29,8 @@ 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], [2])
-m4_define([lt_age], [5])
+m4_define([lt_revision], [0])
+m4_define([lt_age], [6])
 
 LT_VERSION_INFO="lt_current:lt_revision:lt_age"
 AC_SUBST(LT_VERSION_INFO)

doc/Doxyfile

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING = UTF-8
 PROJECT_NAME = libfluidsynth
-PROJECT_NUMBER = 1.1.6
+PROJECT_NUMBER = 1.1.7
 OUTPUT_DIRECTORY = api
 CREATE_SUBDIRS = NO
 OUTPUT_LANGUAGE = English

doc/fluidsynth-v11-devdoc.txt

@@ -6,9 +6,10 @@
 \author Pedro López-Cabanillas
 \author Josh Green
 \author David Henningsson
-\author Copyright © 2003-2017 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson
-\version Revision 1.1.6
-\date 2012-08-04
+\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
 
 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.
 
@@ -20,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_7
 - \ref NewIn1_1_6
 - \ref NewIn1_1_5
 - \ref NewIn1_1_4
@@ -63,6 +65,23 @@ What is FluidSynth?
 
 - FluidSynth is open source, in active development. For more details, take a look at http://www.fluidsynth.org
 
+\section NewIn1_1_7 Whats new in 1.1.7?
+
+Changes in FluidSynth 1.1.7 concerning developers:
+
+- "synth.parallel-render" has been deprecated
+- fluid_synth_set_channel_type() was not exported properly
+- "audio.jack.multi" had inverse logic
+- fluid_synth_write_*() had timing issues when requesting more than 64 audio frames
+- reverb and chorus are routed to distinct buffers in fluid_synth_nwrite_float()
+- vorbis-compressed sf3 sound fonts are supported
+- the following getters have been added: fluid_voice_is_on(), fluid_voice_is_sustained(), fluid_voice_is_sostenuto(), fluid_voice_get_channel(), fluid_voice_get_key(), fluid_voice_get_actual_key(), fluid_voice_get_velocity(), fluid_voice_get_actual_velocity(), fluid_player_get_current_tick(), fluid_player_get_total_ticks(), fluid_player_get_bpm(), fluid_player_get_midi_tempo()
+- the following enum values have been deprecated: \c FLUID_SEQ_LASTEVENT, \c GEN_LAST, \c LAST_LOG_LEVEL
+
+- For a full list of bug fixes, see
+  https://github.com/FluidSynth/fluidsynth/wiki/ChangeLog#fluidsynth-117
+
+
 \section NewIn1_1_6 Whats new in 1.1.6?
 
 Changes in FluidSynth 1.1.6 concerning developers:

include/fluidsynth/event.h

@@ -58,7 +58,7 @@ enum fluid_seq_event_type {
   FLUID_SEQ_CHANNELPRESSURE,    /**< Channel aftertouch event @since 1.1.0 */
   FLUID_SEQ_SYSTEMRESET,        /**< System reset event @since 1.1.0 */
   FLUID_SEQ_UNREGISTERING,      /**< Called when a sequencer client is being unregistered. @since 1.1.0 */
-  FLUID_SEQ_LASTEVENT		/**< Defines the count of event enums */
+  FLUID_SEQ_LASTEVENT		/**< Defines the count of event enums @deprecated As of 1.1.7 this enum value is deprecated and will be removed in a future release, because it prevents adding new enum values without breaking ABI compatibility. */
 };
 
 #define FLUID_SEQ_PITCHWHHELSENS        FLUID_SEQ_PITCHWHEELSENS        /**< Old deprecated misspelling of #FLUID_SEQ_PITCHWHEELSENS */

include/fluidsynth/gen.h

@@ -99,7 +99,7 @@ enum fluid_gen_type {
    * is used, however, as the destination for the default pitch wheel
    * modulator. */
   GEN_PITCH,			/**< Pitch (NOTE: Not a real SoundFont generator) */
-  GEN_LAST			/**< Value defines the count of generators (#fluid_gen_type) */
+  GEN_LAST			/**< Value defines the count of generators (#fluid_gen_type) @deprecated As of 1.1.7 this enum value is deprecated and will be removed in a future release, because it prevents adding new enum values without breaking ABI compatibility. */
 };
 
 

include/fluidsynth/log.h

@@ -58,7 +58,7 @@ enum fluid_log_level {
   FLUID_WARN,    /**< Warning */
   FLUID_INFO,    /**< Verbose informational messages */
   FLUID_DBG,     /**< Debugging messages */
-  LAST_LOG_LEVEL
+  LAST_LOG_LEVEL /**< @deprecated As of 1.1.7 this enum value is deprecated and will be removed in a future release, because it prevents adding new enum values without breaking ABI compatibility. */
 };
 
 /**