diff --git a/.travis.yml b/.travis.yml index a6ec97d8..d5112272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -170,7 +170,6 @@ before_install: - eval "${MATRIX_EVAL}" before_script: - - cd fluidsynth - mkdir build && cd build script: diff --git a/fluidsynth/AUTHORS b/AUTHORS similarity index 97% rename from fluidsynth/AUTHORS rename to AUTHORS index 910d7401..bbf8ce3d 100644 --- a/fluidsynth/AUTHORS +++ b/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, diff --git a/fluidsynth/CMakeLists.txt b/CMakeLists.txt similarity index 98% rename from fluidsynth/CMakeLists.txt rename to CMakeLists.txt index 920c6b49..ff120d6c 100644 --- a/fluidsynth/CMakeLists.txt +++ b/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} ) diff --git a/fluidsynth/ChangeLog b/ChangeLog similarity index 100% rename from fluidsynth/ChangeLog rename to ChangeLog diff --git a/fluidsynth/INSTALL b/INSTALL similarity index 100% rename from fluidsynth/INSTALL rename to INSTALL diff --git a/fluidsynth/Makefile.am b/Makefile.am similarity index 100% rename from fluidsynth/Makefile.am rename to Makefile.am diff --git a/fluidsynth/NEWS b/NEWS similarity index 100% rename from fluidsynth/NEWS rename to NEWS diff --git a/fluidsynth/README-OSX b/README-OSX similarity index 100% rename from fluidsynth/README-OSX rename to README-OSX diff --git a/fluidsynth/README.cmake b/README.cmake similarity index 100% rename from fluidsynth/README.cmake rename to README.cmake diff --git a/fluidsynth/THANKS b/THANKS similarity index 100% rename from fluidsynth/THANKS rename to THANKS diff --git a/fluidsynth/TODO b/TODO similarity index 100% rename from fluidsynth/TODO rename to TODO diff --git a/fluidsynth/acinclude.m4 b/acinclude.m4 similarity index 100% rename from fluidsynth/acinclude.m4 rename to acinclude.m4 diff --git a/fluidsynth/autogen.sh b/autogen.sh similarity index 100% rename from fluidsynth/autogen.sh rename to autogen.sh diff --git a/fluidsynth/bindings/README b/bindings/README similarity index 100% rename from fluidsynth/bindings/README rename to bindings/README diff --git a/fluidsynth/bindings/fluidmax/README.TXT b/bindings/fluidmax/README.TXT similarity index 100% rename from fluidsynth/bindings/fluidmax/README.TXT rename to bindings/fluidmax/README.TXT diff --git a/fluidsynth/bindings/fluidmax/build/osx-macho/fluidmax.xcodeproj/project.pbxproj b/bindings/fluidmax/build/osx-macho/fluidmax.xcodeproj/project.pbxproj similarity index 100% rename from fluidsynth/bindings/fluidmax/build/osx-macho/fluidmax.xcodeproj/project.pbxproj rename to bindings/fluidmax/build/osx-macho/fluidmax.xcodeproj/project.pbxproj diff --git a/fluidsynth/bindings/fluidmax/build/osx-macho/maxternal.plist b/bindings/fluidmax/build/osx-macho/maxternal.plist similarity index 100% rename from fluidsynth/bindings/fluidmax/build/osx-macho/maxternal.plist rename to bindings/fluidmax/build/osx-macho/maxternal.plist diff --git a/fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.def b/bindings/fluidmax/build/winxp-vs8/fluidsynth.def similarity index 100% rename from fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.def rename to bindings/fluidmax/build/winxp-vs8/fluidsynth.def diff --git a/fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.sln b/bindings/fluidmax/build/winxp-vs8/fluidsynth.sln similarity index 100% rename from fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.sln rename to bindings/fluidmax/build/winxp-vs8/fluidsynth.sln diff --git a/fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.suo b/bindings/fluidmax/build/winxp-vs8/fluidsynth.suo similarity index 100% rename from fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.suo rename to bindings/fluidmax/build/winxp-vs8/fluidsynth.suo diff --git a/fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.vcproj b/bindings/fluidmax/build/winxp-vs8/fluidsynth.vcproj similarity index 100% rename from fluidsynth/bindings/fluidmax/build/winxp-vs8/fluidsynth.vcproj rename to bindings/fluidmax/build/winxp-vs8/fluidsynth.vcproj diff --git a/fluidsynth/bindings/fluidmax/config_maxmsp.h b/bindings/fluidmax/config_maxmsp.h similarity index 100% rename from fluidsynth/bindings/fluidmax/config_maxmsp.h rename to bindings/fluidmax/config_maxmsp.h diff --git a/fluidsynth/bindings/fluidmax/fluidmax.c b/bindings/fluidmax/fluidmax.c similarity index 100% rename from fluidsynth/bindings/fluidmax/fluidmax.c rename to bindings/fluidmax/fluidmax.c diff --git a/fluidsynth/bindings/fluidmax/fluidmax.mcp b/bindings/fluidmax/fluidmax.mcp similarity index 100% rename from fluidsynth/bindings/fluidmax/fluidmax.mcp rename to bindings/fluidmax/fluidmax.mcp diff --git a/fluidsynth/bindings/fluidmax/fluidmax_fakefuns.c b/bindings/fluidmax/fluidmax_fakefuns.c similarity index 100% rename from fluidsynth/bindings/fluidmax/fluidmax_fakefuns.c rename to bindings/fluidmax/fluidmax_fakefuns.c diff --git a/fluidsynth/bindings/fluidmax/fluidsynth.jpg b/bindings/fluidmax/fluidsynth.jpg similarity index 100% rename from fluidsynth/bindings/fluidmax/fluidsynth.jpg rename to bindings/fluidmax/fluidsynth.jpg diff --git a/fluidsynth/bindings/fluidmax/fluidsynth/version.h b/bindings/fluidmax/fluidsynth/version.h similarity index 100% rename from fluidsynth/bindings/fluidmax/fluidsynth/version.h rename to bindings/fluidmax/fluidsynth/version.h diff --git a/fluidsynth/bindings/fluidmax/fluidsynth~.help b/bindings/fluidmax/fluidsynth~.help similarity index 100% rename from fluidsynth/bindings/fluidmax/fluidsynth~.help rename to bindings/fluidmax/fluidsynth~.help diff --git a/fluidsynth/bindings/fluidmax/ftmax.h b/bindings/fluidmax/ftmax.h similarity index 100% rename from fluidsynth/bindings/fluidmax/ftmax.h rename to bindings/fluidmax/ftmax.h diff --git a/fluidsynth/bindings/fluidsynth_jni/README b/bindings/fluidsynth_jni/README similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/README rename to bindings/fluidsynth_jni/README diff --git a/fluidsynth/bindings/fluidsynth_jni/fluidsynth_jni.dsp b/bindings/fluidsynth_jni/fluidsynth_jni.dsp similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/fluidsynth_jni.dsp rename to bindings/fluidsynth_jni/fluidsynth_jni.dsp diff --git a/fluidsynth/bindings/fluidsynth_jni/fluidsynth_jni.dsw b/bindings/fluidsynth_jni/fluidsynth_jni.dsw similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/fluidsynth_jni.dsw rename to bindings/fluidsynth_jni/fluidsynth_jni.dsw diff --git a/fluidsynth/bindings/fluidsynth_jni/include/sndfile.h b/bindings/fluidsynth_jni/include/sndfile.h similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/include/sndfile.h rename to bindings/fluidsynth_jni/include/sndfile.h diff --git a/fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/FluidException.java b/bindings/fluidsynth_jni/java/fluidsynth/FluidException.java similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/FluidException.java rename to bindings/fluidsynth_jni/java/fluidsynth/FluidException.java diff --git a/fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/Sample.java b/bindings/fluidsynth_jni/java/fluidsynth/Sample.java similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/Sample.java rename to bindings/fluidsynth_jni/java/fluidsynth/Sample.java diff --git a/fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/Synth.java b/bindings/fluidsynth_jni/java/fluidsynth/Synth.java similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/Synth.java rename to bindings/fluidsynth_jni/java/fluidsynth/Synth.java diff --git a/fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/Test.java b/bindings/fluidsynth_jni/java/fluidsynth/Test.java similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/java/fluidsynth/Test.java rename to bindings/fluidsynth_jni/java/fluidsynth/Test.java diff --git a/fluidsynth/bindings/fluidsynth_jni/lib/libsndfile.lib b/bindings/fluidsynth_jni/lib/libsndfile.lib similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/lib/libsndfile.lib rename to bindings/fluidsynth_jni/lib/libsndfile.lib diff --git a/fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Sample.cpp b/bindings/fluidsynth_jni/src/fluidsynth_Sample.cpp similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Sample.cpp rename to bindings/fluidsynth_jni/src/fluidsynth_Sample.cpp diff --git a/fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Sample.h b/bindings/fluidsynth_jni/src/fluidsynth_Sample.h similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Sample.h rename to bindings/fluidsynth_jni/src/fluidsynth_Sample.h diff --git a/fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Synth.cpp b/bindings/fluidsynth_jni/src/fluidsynth_Synth.cpp similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Synth.cpp rename to bindings/fluidsynth_jni/src/fluidsynth_Synth.cpp diff --git a/fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Synth.h b/bindings/fluidsynth_jni/src/fluidsynth_Synth.h similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_Synth.h rename to bindings/fluidsynth_jni/src/fluidsynth_Synth.h diff --git a/fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_jni.cpp b/bindings/fluidsynth_jni/src/fluidsynth_jni.cpp similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_jni.cpp rename to bindings/fluidsynth_jni/src/fluidsynth_jni.cpp diff --git a/fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_jni.h b/bindings/fluidsynth_jni/src/fluidsynth_jni.h similarity index 100% rename from fluidsynth/bindings/fluidsynth_jni/src/fluidsynth_jni.h rename to bindings/fluidsynth_jni/src/fluidsynth_jni.h diff --git a/fluidsynth/cmake_admin/CheckDIRSymbolExists.cmake b/cmake_admin/CheckDIRSymbolExists.cmake similarity index 100% rename from fluidsynth/cmake_admin/CheckDIRSymbolExists.cmake rename to cmake_admin/CheckDIRSymbolExists.cmake diff --git a/fluidsynth/cmake_admin/CheckPrototypeExists.cmake b/cmake_admin/CheckPrototypeExists.cmake similarity index 100% rename from fluidsynth/cmake_admin/CheckPrototypeExists.cmake rename to cmake_admin/CheckPrototypeExists.cmake diff --git a/fluidsynth/cmake_admin/CheckSTDC.cmake b/cmake_admin/CheckSTDC.cmake similarity index 100% rename from fluidsynth/cmake_admin/CheckSTDC.cmake rename to cmake_admin/CheckSTDC.cmake diff --git a/fluidsynth/cmake_admin/DefaultDirs.cmake b/cmake_admin/DefaultDirs.cmake similarity index 100% rename from fluidsynth/cmake_admin/DefaultDirs.cmake rename to cmake_admin/DefaultDirs.cmake diff --git a/fluidsynth/cmake_admin/FindMidiShare.cmake b/cmake_admin/FindMidiShare.cmake similarity index 100% rename from fluidsynth/cmake_admin/FindMidiShare.cmake rename to cmake_admin/FindMidiShare.cmake diff --git a/fluidsynth/cmake_admin/FindOSS.cmake b/cmake_admin/FindOSS.cmake similarity index 100% rename from fluidsynth/cmake_admin/FindOSS.cmake rename to cmake_admin/FindOSS.cmake diff --git a/fluidsynth/cmake_admin/FindReadline.cmake b/cmake_admin/FindReadline.cmake similarity index 100% rename from fluidsynth/cmake_admin/FindReadline.cmake rename to cmake_admin/FindReadline.cmake diff --git a/fluidsynth/cmake_admin/Makefile.am b/cmake_admin/Makefile.am similarity index 100% rename from fluidsynth/cmake_admin/Makefile.am rename to cmake_admin/Makefile.am diff --git a/fluidsynth/cmake_admin/TestInline.cmake b/cmake_admin/TestInline.cmake similarity index 100% rename from fluidsynth/cmake_admin/TestInline.cmake rename to cmake_admin/TestInline.cmake diff --git a/fluidsynth/cmake_admin/TestVLA.cmake b/cmake_admin/TestVLA.cmake similarity index 100% rename from fluidsynth/cmake_admin/TestVLA.cmake rename to cmake_admin/TestVLA.cmake diff --git a/fluidsynth/cmake_admin/UnsetPkgConfig.cmake b/cmake_admin/UnsetPkgConfig.cmake similarity index 100% rename from fluidsynth/cmake_admin/UnsetPkgConfig.cmake rename to cmake_admin/UnsetPkgConfig.cmake diff --git a/fluidsynth/cmake_admin/cmake_uninstall.cmake.in b/cmake_admin/cmake_uninstall.cmake.in similarity index 100% rename from fluidsynth/cmake_admin/cmake_uninstall.cmake.in rename to cmake_admin/cmake_uninstall.cmake.in diff --git a/fluidsynth/cmake_admin/report.cmake b/cmake_admin/report.cmake similarity index 100% rename from fluidsynth/cmake_admin/report.cmake rename to cmake_admin/report.cmake diff --git a/fluidsynth/configure.ac b/configure.ac similarity index 99% rename from fluidsynth/configure.ac rename to configure.ac index 60671195..851f78cb 100644 --- a/fluidsynth/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=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) diff --git a/fluidsynth/doc/CMakeLists.txt b/doc/CMakeLists.txt similarity index 100% rename from fluidsynth/doc/CMakeLists.txt rename to doc/CMakeLists.txt diff --git a/fluidsynth/doc/Doxyfile b/doc/Doxyfile similarity index 99% rename from fluidsynth/doc/Doxyfile rename to doc/Doxyfile index b0dad17a..28a399ee 100644 --- a/fluidsynth/doc/Doxyfile +++ b/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 diff --git a/fluidsynth/doc/Doxyfile.cmake b/doc/Doxyfile.cmake similarity index 100% rename from fluidsynth/doc/Doxyfile.cmake rename to doc/Doxyfile.cmake diff --git a/fluidsynth/doc/FluidSynth Thread safety paper for LAC 2011.odt b/doc/FluidSynth Thread safety paper for LAC 2011.odt similarity index 100% rename from fluidsynth/doc/FluidSynth Thread safety paper for LAC 2011.odt rename to doc/FluidSynth Thread safety paper for LAC 2011.odt diff --git a/fluidsynth/doc/FluidSynth-LADSPA.pdf b/doc/FluidSynth-LADSPA.pdf similarity index 100% rename from fluidsynth/doc/FluidSynth-LADSPA.pdf rename to doc/FluidSynth-LADSPA.pdf diff --git a/fluidsynth/doc/Makefile.am b/doc/Makefile.am similarity index 100% rename from fluidsynth/doc/Makefile.am rename to doc/Makefile.am diff --git a/fluidsynth/doc/README b/doc/README similarity index 100% rename from fluidsynth/doc/README rename to doc/README diff --git a/fluidsynth/doc/example.c b/doc/example.c similarity index 100% rename from fluidsynth/doc/example.c rename to doc/example.c diff --git a/fluidsynth/doc/fluidsynth-v10-devdoc.xml b/doc/fluidsynth-v10-devdoc.xml similarity index 100% rename from fluidsynth/doc/fluidsynth-v10-devdoc.xml rename to doc/fluidsynth-v10-devdoc.xml diff --git a/fluidsynth/doc/fluidsynth-v11-devdoc.txt b/doc/fluidsynth-v11-devdoc.txt similarity index 98% rename from fluidsynth/doc/fluidsynth-v11-devdoc.txt rename to doc/fluidsynth-v11-devdoc.txt index dfcd7b9d..1b963824 100644 --- a/fluidsynth/doc/fluidsynth-v11-devdoc.txt +++ b/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. @@ -18,8 +19,9 @@ All the source code examples in this document are in the public domain; you can \section Contents Table of Contents -- \ref Disclaimer -- \ref Introduction +- \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: diff --git a/fluidsynth/doc/fluidsynth.1 b/doc/fluidsynth.1 similarity index 100% rename from fluidsynth/doc/fluidsynth.1 rename to doc/fluidsynth.1 diff --git a/fluidsynth/doc/fluidsynth_arpeggio.c b/doc/fluidsynth_arpeggio.c similarity index 100% rename from fluidsynth/doc/fluidsynth_arpeggio.c rename to doc/fluidsynth_arpeggio.c diff --git a/fluidsynth/doc/fluidsynth_fx.c b/doc/fluidsynth_fx.c similarity index 100% rename from fluidsynth/doc/fluidsynth_fx.c rename to doc/fluidsynth_fx.c diff --git a/fluidsynth/doc/fluidsynth_metronome.c b/doc/fluidsynth_metronome.c similarity index 100% rename from fluidsynth/doc/fluidsynth_metronome.c rename to doc/fluidsynth_metronome.c diff --git a/fluidsynth/doc/fluidsynth_simple.c b/doc/fluidsynth_simple.c similarity index 100% rename from fluidsynth/doc/fluidsynth_simple.c rename to doc/fluidsynth_simple.c diff --git a/fluidsynth/doc/xtrafluid.txt b/doc/xtrafluid.txt similarity index 100% rename from fluidsynth/doc/xtrafluid.txt rename to doc/xtrafluid.txt diff --git a/fluidsynth/fluidsynth.anjuta b/fluidsynth.anjuta similarity index 100% rename from fluidsynth/fluidsynth.anjuta rename to fluidsynth.anjuta diff --git a/fluidsynth/fluidsynth.pc.in b/fluidsynth.pc.in similarity index 100% rename from fluidsynth/fluidsynth.pc.in rename to fluidsynth.pc.in diff --git a/fluidsynth/fluidsynth.spec.in b/fluidsynth.spec.in similarity index 100% rename from fluidsynth/fluidsynth.spec.in rename to fluidsynth.spec.in diff --git a/fluidsynth/include/CMakeLists.txt b/include/CMakeLists.txt similarity index 100% rename from fluidsynth/include/CMakeLists.txt rename to include/CMakeLists.txt diff --git a/fluidsynth/include/Makefile.am b/include/Makefile.am similarity index 100% rename from fluidsynth/include/Makefile.am rename to include/Makefile.am diff --git a/fluidsynth/include/fluidsynth.h b/include/fluidsynth.h similarity index 100% rename from fluidsynth/include/fluidsynth.h rename to include/fluidsynth.h diff --git a/fluidsynth/include/fluidsynth/CMakeLists.txt b/include/fluidsynth/CMakeLists.txt similarity index 100% rename from fluidsynth/include/fluidsynth/CMakeLists.txt rename to include/fluidsynth/CMakeLists.txt diff --git a/fluidsynth/include/fluidsynth/Makefile.am b/include/fluidsynth/Makefile.am similarity index 100% rename from fluidsynth/include/fluidsynth/Makefile.am rename to include/fluidsynth/Makefile.am diff --git a/fluidsynth/include/fluidsynth/audio.h b/include/fluidsynth/audio.h similarity index 100% rename from fluidsynth/include/fluidsynth/audio.h rename to include/fluidsynth/audio.h diff --git a/fluidsynth/include/fluidsynth/event.h b/include/fluidsynth/event.h similarity index 96% rename from fluidsynth/include/fluidsynth/event.h rename to include/fluidsynth/event.h index 84dfd1f9..ebf70c36 100644 --- a/fluidsynth/include/fluidsynth/event.h +++ b/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 */ diff --git a/fluidsynth/include/fluidsynth/gen.h b/include/fluidsynth/gen.h similarity index 96% rename from fluidsynth/include/fluidsynth/gen.h rename to include/fluidsynth/gen.h index 70afac59..6aae094e 100644 --- a/fluidsynth/include/fluidsynth/gen.h +++ b/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. */ }; diff --git a/fluidsynth/include/fluidsynth/log.h b/include/fluidsynth/log.h similarity index 93% rename from fluidsynth/include/fluidsynth/log.h rename to include/fluidsynth/log.h index 8ebe48d2..cd9f4041 100644 --- a/fluidsynth/include/fluidsynth/log.h +++ b/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. */ }; /** diff --git a/fluidsynth/include/fluidsynth/midi.h b/include/fluidsynth/midi.h similarity index 100% rename from fluidsynth/include/fluidsynth/midi.h rename to include/fluidsynth/midi.h diff --git a/fluidsynth/include/fluidsynth/misc.h b/include/fluidsynth/misc.h similarity index 100% rename from fluidsynth/include/fluidsynth/misc.h rename to include/fluidsynth/misc.h diff --git a/fluidsynth/include/fluidsynth/mod.h b/include/fluidsynth/mod.h similarity index 100% rename from fluidsynth/include/fluidsynth/mod.h rename to include/fluidsynth/mod.h diff --git a/fluidsynth/include/fluidsynth/ramsfont.h b/include/fluidsynth/ramsfont.h similarity index 100% rename from fluidsynth/include/fluidsynth/ramsfont.h rename to include/fluidsynth/ramsfont.h diff --git a/fluidsynth/include/fluidsynth/seq.h b/include/fluidsynth/seq.h similarity index 100% rename from fluidsynth/include/fluidsynth/seq.h rename to include/fluidsynth/seq.h diff --git a/fluidsynth/include/fluidsynth/seqbind.h b/include/fluidsynth/seqbind.h similarity index 100% rename from fluidsynth/include/fluidsynth/seqbind.h rename to include/fluidsynth/seqbind.h diff --git a/fluidsynth/include/fluidsynth/settings.h b/include/fluidsynth/settings.h similarity index 100% rename from fluidsynth/include/fluidsynth/settings.h rename to include/fluidsynth/settings.h diff --git a/fluidsynth/include/fluidsynth/sfont.h b/include/fluidsynth/sfont.h similarity index 100% rename from fluidsynth/include/fluidsynth/sfont.h rename to include/fluidsynth/sfont.h diff --git a/fluidsynth/include/fluidsynth/shell.h b/include/fluidsynth/shell.h similarity index 100% rename from fluidsynth/include/fluidsynth/shell.h rename to include/fluidsynth/shell.h diff --git a/fluidsynth/include/fluidsynth/synth.h b/include/fluidsynth/synth.h similarity index 100% rename from fluidsynth/include/fluidsynth/synth.h rename to include/fluidsynth/synth.h diff --git a/fluidsynth/include/fluidsynth/types.h b/include/fluidsynth/types.h similarity index 100% rename from fluidsynth/include/fluidsynth/types.h rename to include/fluidsynth/types.h diff --git a/fluidsynth/include/fluidsynth/version.h.in b/include/fluidsynth/version.h.in similarity index 100% rename from fluidsynth/include/fluidsynth/version.h.in rename to include/fluidsynth/version.h.in diff --git a/fluidsynth/include/fluidsynth/voice.h b/include/fluidsynth/voice.h similarity index 100% rename from fluidsynth/include/fluidsynth/voice.h rename to include/fluidsynth/voice.h diff --git a/fluidsynth/install-sh b/install-sh similarity index 100% rename from fluidsynth/install-sh rename to install-sh diff --git a/fluidsynth/missing b/missing similarity index 100% rename from fluidsynth/missing rename to missing diff --git a/fluidsynth/mkinstalldirs b/mkinstalldirs similarity index 100% rename from fluidsynth/mkinstalldirs rename to mkinstalldirs diff --git a/fluidsynth/src/CMakeLists.txt b/src/CMakeLists.txt similarity index 100% rename from fluidsynth/src/CMakeLists.txt rename to src/CMakeLists.txt diff --git a/fluidsynth/src/Makefile.am b/src/Makefile.am similarity index 100% rename from fluidsynth/src/Makefile.am rename to src/Makefile.am diff --git a/fluidsynth/src/bindings/fluid_cmd.c b/src/bindings/fluid_cmd.c similarity index 100% rename from fluidsynth/src/bindings/fluid_cmd.c rename to src/bindings/fluid_cmd.c diff --git a/fluidsynth/src/bindings/fluid_cmd.h b/src/bindings/fluid_cmd.h similarity index 100% rename from fluidsynth/src/bindings/fluid_cmd.h rename to src/bindings/fluid_cmd.h diff --git a/fluidsynth/src/bindings/fluid_filerenderer.c b/src/bindings/fluid_filerenderer.c similarity index 100% rename from fluidsynth/src/bindings/fluid_filerenderer.c rename to src/bindings/fluid_filerenderer.c diff --git a/fluidsynth/src/bindings/fluid_ladspa.c b/src/bindings/fluid_ladspa.c similarity index 100% rename from fluidsynth/src/bindings/fluid_ladspa.c rename to src/bindings/fluid_ladspa.c diff --git a/fluidsynth/src/bindings/fluid_ladspa.h b/src/bindings/fluid_ladspa.h similarity index 100% rename from fluidsynth/src/bindings/fluid_ladspa.h rename to src/bindings/fluid_ladspa.h diff --git a/fluidsynth/src/bindings/fluid_lash.c b/src/bindings/fluid_lash.c similarity index 100% rename from fluidsynth/src/bindings/fluid_lash.c rename to src/bindings/fluid_lash.c diff --git a/fluidsynth/src/bindings/fluid_lash.h b/src/bindings/fluid_lash.h similarity index 100% rename from fluidsynth/src/bindings/fluid_lash.h rename to src/bindings/fluid_lash.h diff --git a/fluidsynth/src/bindings/fluid_rtkit.c b/src/bindings/fluid_rtkit.c similarity index 100% rename from fluidsynth/src/bindings/fluid_rtkit.c rename to src/bindings/fluid_rtkit.c diff --git a/fluidsynth/src/bindings/fluid_rtkit.h b/src/bindings/fluid_rtkit.h similarity index 100% rename from fluidsynth/src/bindings/fluid_rtkit.h rename to src/bindings/fluid_rtkit.h diff --git a/fluidsynth/src/config.cmake b/src/config.cmake similarity index 100% rename from fluidsynth/src/config.cmake rename to src/config.cmake diff --git a/fluidsynth/src/config_macos.h b/src/config_macos.h similarity index 100% rename from fluidsynth/src/config_macos.h rename to src/config_macos.h diff --git a/fluidsynth/src/config_macosx.h b/src/config_macosx.h similarity index 100% rename from fluidsynth/src/config_macosx.h rename to src/config_macosx.h diff --git a/fluidsynth/src/config_macosx_pb.h b/src/config_macosx_pb.h similarity index 100% rename from fluidsynth/src/config_macosx_pb.h rename to src/config_macosx_pb.h diff --git a/fluidsynth/src/config_win32.cmake b/src/config_win32.cmake similarity index 100% rename from fluidsynth/src/config_win32.cmake rename to src/config_win32.cmake diff --git a/fluidsynth/src/config_win32.h.in b/src/config_win32.h.in similarity index 100% rename from fluidsynth/src/config_win32.h.in rename to src/config_win32.h.in diff --git a/fluidsynth/src/drivers/fluid_adriver.c b/src/drivers/fluid_adriver.c similarity index 100% rename from fluidsynth/src/drivers/fluid_adriver.c rename to src/drivers/fluid_adriver.c diff --git a/fluidsynth/src/drivers/fluid_adriver.h b/src/drivers/fluid_adriver.h similarity index 100% rename from fluidsynth/src/drivers/fluid_adriver.h rename to src/drivers/fluid_adriver.h diff --git a/fluidsynth/src/drivers/fluid_alsa.c b/src/drivers/fluid_alsa.c similarity index 100% rename from fluidsynth/src/drivers/fluid_alsa.c rename to src/drivers/fluid_alsa.c diff --git a/fluidsynth/src/drivers/fluid_aufile.c b/src/drivers/fluid_aufile.c similarity index 100% rename from fluidsynth/src/drivers/fluid_aufile.c rename to src/drivers/fluid_aufile.c diff --git a/fluidsynth/src/drivers/fluid_coreaudio.c b/src/drivers/fluid_coreaudio.c similarity index 100% rename from fluidsynth/src/drivers/fluid_coreaudio.c rename to src/drivers/fluid_coreaudio.c diff --git a/fluidsynth/src/drivers/fluid_coremidi.c b/src/drivers/fluid_coremidi.c similarity index 100% rename from fluidsynth/src/drivers/fluid_coremidi.c rename to src/drivers/fluid_coremidi.c diff --git a/fluidsynth/src/drivers/fluid_dart.c b/src/drivers/fluid_dart.c similarity index 100% rename from fluidsynth/src/drivers/fluid_dart.c rename to src/drivers/fluid_dart.c diff --git a/fluidsynth/src/drivers/fluid_dsound.c b/src/drivers/fluid_dsound.c similarity index 100% rename from fluidsynth/src/drivers/fluid_dsound.c rename to src/drivers/fluid_dsound.c diff --git a/fluidsynth/src/drivers/fluid_jack.c b/src/drivers/fluid_jack.c similarity index 100% rename from fluidsynth/src/drivers/fluid_jack.c rename to src/drivers/fluid_jack.c diff --git a/fluidsynth/src/drivers/fluid_mdriver.c b/src/drivers/fluid_mdriver.c similarity index 100% rename from fluidsynth/src/drivers/fluid_mdriver.c rename to src/drivers/fluid_mdriver.c diff --git a/fluidsynth/src/drivers/fluid_mdriver.h b/src/drivers/fluid_mdriver.h similarity index 100% rename from fluidsynth/src/drivers/fluid_mdriver.h rename to src/drivers/fluid_mdriver.h diff --git a/fluidsynth/src/drivers/fluid_midishare.c b/src/drivers/fluid_midishare.c similarity index 100% rename from fluidsynth/src/drivers/fluid_midishare.c rename to src/drivers/fluid_midishare.c diff --git a/fluidsynth/src/drivers/fluid_oss.c b/src/drivers/fluid_oss.c similarity index 100% rename from fluidsynth/src/drivers/fluid_oss.c rename to src/drivers/fluid_oss.c diff --git a/fluidsynth/src/drivers/fluid_portaudio.c b/src/drivers/fluid_portaudio.c similarity index 100% rename from fluidsynth/src/drivers/fluid_portaudio.c rename to src/drivers/fluid_portaudio.c diff --git a/fluidsynth/src/drivers/fluid_pulse.c b/src/drivers/fluid_pulse.c similarity index 100% rename from fluidsynth/src/drivers/fluid_pulse.c rename to src/drivers/fluid_pulse.c diff --git a/fluidsynth/src/drivers/fluid_sndmgr.c b/src/drivers/fluid_sndmgr.c similarity index 100% rename from fluidsynth/src/drivers/fluid_sndmgr.c rename to src/drivers/fluid_sndmgr.c diff --git a/fluidsynth/src/drivers/fluid_winmidi.c b/src/drivers/fluid_winmidi.c similarity index 100% rename from fluidsynth/src/drivers/fluid_winmidi.c rename to src/drivers/fluid_winmidi.c diff --git a/fluidsynth/src/fluid_dll.c b/src/fluid_dll.c similarity index 100% rename from fluidsynth/src/fluid_dll.c rename to src/fluid_dll.c diff --git a/fluidsynth/src/fluidsynth.c b/src/fluidsynth.c similarity index 100% rename from fluidsynth/src/fluidsynth.c rename to src/fluidsynth.c diff --git a/fluidsynth/src/midi/fluid_midi.c b/src/midi/fluid_midi.c similarity index 100% rename from fluidsynth/src/midi/fluid_midi.c rename to src/midi/fluid_midi.c diff --git a/fluidsynth/src/midi/fluid_midi.h b/src/midi/fluid_midi.h similarity index 100% rename from fluidsynth/src/midi/fluid_midi.h rename to src/midi/fluid_midi.h diff --git a/fluidsynth/src/midi/fluid_midi_router.c b/src/midi/fluid_midi_router.c similarity index 100% rename from fluidsynth/src/midi/fluid_midi_router.c rename to src/midi/fluid_midi_router.c diff --git a/fluidsynth/src/midi/fluid_midi_router.h b/src/midi/fluid_midi_router.h similarity index 100% rename from fluidsynth/src/midi/fluid_midi_router.h rename to src/midi/fluid_midi_router.h diff --git a/fluidsynth/src/midi/fluid_seq.c b/src/midi/fluid_seq.c similarity index 100% rename from fluidsynth/src/midi/fluid_seq.c rename to src/midi/fluid_seq.c diff --git a/fluidsynth/src/midi/fluid_seqbind.c b/src/midi/fluid_seqbind.c similarity index 100% rename from fluidsynth/src/midi/fluid_seqbind.c rename to src/midi/fluid_seqbind.c diff --git a/fluidsynth/src/rvoice/fluid_adsr_env.c b/src/rvoice/fluid_adsr_env.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_adsr_env.c rename to src/rvoice/fluid_adsr_env.c diff --git a/fluidsynth/src/rvoice/fluid_adsr_env.h b/src/rvoice/fluid_adsr_env.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_adsr_env.h rename to src/rvoice/fluid_adsr_env.h diff --git a/fluidsynth/src/rvoice/fluid_chorus.c b/src/rvoice/fluid_chorus.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_chorus.c rename to src/rvoice/fluid_chorus.c diff --git a/fluidsynth/src/rvoice/fluid_chorus.h b/src/rvoice/fluid_chorus.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_chorus.h rename to src/rvoice/fluid_chorus.h diff --git a/fluidsynth/src/rvoice/fluid_iir_filter.c b/src/rvoice/fluid_iir_filter.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_iir_filter.c rename to src/rvoice/fluid_iir_filter.c diff --git a/fluidsynth/src/rvoice/fluid_iir_filter.h b/src/rvoice/fluid_iir_filter.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_iir_filter.h rename to src/rvoice/fluid_iir_filter.h diff --git a/fluidsynth/src/rvoice/fluid_lfo.c b/src/rvoice/fluid_lfo.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_lfo.c rename to src/rvoice/fluid_lfo.c diff --git a/fluidsynth/src/rvoice/fluid_lfo.h b/src/rvoice/fluid_lfo.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_lfo.h rename to src/rvoice/fluid_lfo.h diff --git a/fluidsynth/src/rvoice/fluid_phase.h b/src/rvoice/fluid_phase.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_phase.h rename to src/rvoice/fluid_phase.h diff --git a/fluidsynth/src/rvoice/fluid_rev.c b/src/rvoice/fluid_rev.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_rev.c rename to src/rvoice/fluid_rev.c diff --git a/fluidsynth/src/rvoice/fluid_rev.h b/src/rvoice/fluid_rev.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_rev.h rename to src/rvoice/fluid_rev.h diff --git a/fluidsynth/src/rvoice/fluid_rvoice.c b/src/rvoice/fluid_rvoice.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice.c rename to src/rvoice/fluid_rvoice.c diff --git a/fluidsynth/src/rvoice/fluid_rvoice.h b/src/rvoice/fluid_rvoice.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice.h rename to src/rvoice/fluid_rvoice.h diff --git a/fluidsynth/src/rvoice/fluid_rvoice_dsp.c b/src/rvoice/fluid_rvoice_dsp.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice_dsp.c rename to src/rvoice/fluid_rvoice_dsp.c diff --git a/fluidsynth/src/rvoice/fluid_rvoice_event.c b/src/rvoice/fluid_rvoice_event.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice_event.c rename to src/rvoice/fluid_rvoice_event.c diff --git a/fluidsynth/src/rvoice/fluid_rvoice_event.h b/src/rvoice/fluid_rvoice_event.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice_event.h rename to src/rvoice/fluid_rvoice_event.h diff --git a/fluidsynth/src/rvoice/fluid_rvoice_mixer.c b/src/rvoice/fluid_rvoice_mixer.c similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice_mixer.c rename to src/rvoice/fluid_rvoice_mixer.c diff --git a/fluidsynth/src/rvoice/fluid_rvoice_mixer.h b/src/rvoice/fluid_rvoice_mixer.h similarity index 100% rename from fluidsynth/src/rvoice/fluid_rvoice_mixer.h rename to src/rvoice/fluid_rvoice_mixer.h diff --git a/fluidsynth/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c similarity index 100% rename from fluidsynth/src/sfloader/fluid_defsfont.c rename to src/sfloader/fluid_defsfont.c diff --git a/fluidsynth/src/sfloader/fluid_defsfont.h b/src/sfloader/fluid_defsfont.h similarity index 100% rename from fluidsynth/src/sfloader/fluid_defsfont.h rename to src/sfloader/fluid_defsfont.h diff --git a/fluidsynth/src/sfloader/fluid_ramsfont.c b/src/sfloader/fluid_ramsfont.c similarity index 100% rename from fluidsynth/src/sfloader/fluid_ramsfont.c rename to src/sfloader/fluid_ramsfont.c diff --git a/fluidsynth/src/sfloader/fluid_ramsfont.h b/src/sfloader/fluid_ramsfont.h similarity index 100% rename from fluidsynth/src/sfloader/fluid_ramsfont.h rename to src/sfloader/fluid_ramsfont.h diff --git a/fluidsynth/src/sfloader/fluid_sfont.h b/src/sfloader/fluid_sfont.h similarity index 100% rename from fluidsynth/src/sfloader/fluid_sfont.h rename to src/sfloader/fluid_sfont.h diff --git a/fluidsynth/src/synth/fluid_chan.c b/src/synth/fluid_chan.c similarity index 100% rename from fluidsynth/src/synth/fluid_chan.c rename to src/synth/fluid_chan.c diff --git a/fluidsynth/src/synth/fluid_chan.h b/src/synth/fluid_chan.h similarity index 100% rename from fluidsynth/src/synth/fluid_chan.h rename to src/synth/fluid_chan.h diff --git a/fluidsynth/src/synth/fluid_event.c b/src/synth/fluid_event.c similarity index 100% rename from fluidsynth/src/synth/fluid_event.c rename to src/synth/fluid_event.c diff --git a/fluidsynth/src/synth/fluid_event_priv.h b/src/synth/fluid_event_priv.h similarity index 100% rename from fluidsynth/src/synth/fluid_event_priv.h rename to src/synth/fluid_event_priv.h diff --git a/fluidsynth/src/synth/fluid_gen.c b/src/synth/fluid_gen.c similarity index 100% rename from fluidsynth/src/synth/fluid_gen.c rename to src/synth/fluid_gen.c diff --git a/fluidsynth/src/synth/fluid_gen.h b/src/synth/fluid_gen.h similarity index 100% rename from fluidsynth/src/synth/fluid_gen.h rename to src/synth/fluid_gen.h diff --git a/fluidsynth/src/synth/fluid_mod.c b/src/synth/fluid_mod.c similarity index 100% rename from fluidsynth/src/synth/fluid_mod.c rename to src/synth/fluid_mod.c diff --git a/fluidsynth/src/synth/fluid_mod.h b/src/synth/fluid_mod.h similarity index 100% rename from fluidsynth/src/synth/fluid_mod.h rename to src/synth/fluid_mod.h diff --git a/fluidsynth/src/synth/fluid_synth.c b/src/synth/fluid_synth.c similarity index 100% rename from fluidsynth/src/synth/fluid_synth.c rename to src/synth/fluid_synth.c diff --git a/fluidsynth/src/synth/fluid_synth.h b/src/synth/fluid_synth.h similarity index 100% rename from fluidsynth/src/synth/fluid_synth.h rename to src/synth/fluid_synth.h diff --git a/fluidsynth/src/synth/fluid_tuning.c b/src/synth/fluid_tuning.c similarity index 100% rename from fluidsynth/src/synth/fluid_tuning.c rename to src/synth/fluid_tuning.c diff --git a/fluidsynth/src/synth/fluid_tuning.h b/src/synth/fluid_tuning.h similarity index 100% rename from fluidsynth/src/synth/fluid_tuning.h rename to src/synth/fluid_tuning.h diff --git a/fluidsynth/src/synth/fluid_voice.c b/src/synth/fluid_voice.c similarity index 100% rename from fluidsynth/src/synth/fluid_voice.c rename to src/synth/fluid_voice.c diff --git a/fluidsynth/src/synth/fluid_voice.h b/src/synth/fluid_voice.h similarity index 100% rename from fluidsynth/src/synth/fluid_voice.h rename to src/synth/fluid_voice.h diff --git a/fluidsynth/src/unused/fluid_dsp_float.c b/src/unused/fluid_dsp_float.c similarity index 100% rename from fluidsynth/src/unused/fluid_dsp_float.c rename to src/unused/fluid_dsp_float.c diff --git a/fluidsynth/src/unused/fluid_dsp_simple.c b/src/unused/fluid_dsp_simple.c similarity index 100% rename from fluidsynth/src/unused/fluid_dsp_simple.c rename to src/unused/fluid_dsp_simple.c diff --git a/fluidsynth/src/unused/fluid_event_queue.c b/src/unused/fluid_event_queue.c similarity index 100% rename from fluidsynth/src/unused/fluid_event_queue.c rename to src/unused/fluid_event_queue.c diff --git a/fluidsynth/src/unused/fluid_event_queue.h b/src/unused/fluid_event_queue.h similarity index 100% rename from fluidsynth/src/unused/fluid_event_queue.h rename to src/unused/fluid_event_queue.h diff --git a/fluidsynth/src/unused/fluid_rvoice_handler.c b/src/unused/fluid_rvoice_handler.c similarity index 100% rename from fluidsynth/src/unused/fluid_rvoice_handler.c rename to src/unused/fluid_rvoice_handler.c diff --git a/fluidsynth/src/unused/fluid_rvoice_handler.h b/src/unused/fluid_rvoice_handler.h similarity index 100% rename from fluidsynth/src/unused/fluid_rvoice_handler.h rename to src/unused/fluid_rvoice_handler.h diff --git a/fluidsynth/src/unused/macbuild/Makefile.am b/src/unused/macbuild/Makefile.am similarity index 100% rename from fluidsynth/src/unused/macbuild/Makefile.am rename to src/unused/macbuild/Makefile.am diff --git a/fluidsynth/src/unused/macbuild/README.txt b/src/unused/macbuild/README.txt similarity index 100% rename from fluidsynth/src/unused/macbuild/README.txt rename to src/unused/macbuild/README.txt diff --git a/fluidsynth/src/unused/macbuild/fluidsynth.mcp b/src/unused/macbuild/fluidsynth.mcp similarity index 100% rename from fluidsynth/src/unused/macbuild/fluidsynth.mcp rename to src/unused/macbuild/fluidsynth.mcp diff --git a/fluidsynth/src/unused/winbuild/Makefile.am b/src/unused/winbuild/Makefile.am similarity index 100% rename from fluidsynth/src/unused/winbuild/Makefile.am rename to src/unused/winbuild/Makefile.am diff --git a/fluidsynth/src/unused/winbuild/fluidsynth.dsw b/src/unused/winbuild/fluidsynth.dsw similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth.dsw rename to src/unused/winbuild/fluidsynth.dsw diff --git a/fluidsynth/src/unused/winbuild/fluidsynth.sln b/src/unused/winbuild/fluidsynth.sln similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth.sln rename to src/unused/winbuild/fluidsynth.sln diff --git a/fluidsynth/src/unused/winbuild/fluidsynth/Makefile.am b/src/unused/winbuild/fluidsynth/Makefile.am similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth/Makefile.am rename to src/unused/winbuild/fluidsynth/Makefile.am diff --git a/fluidsynth/src/unused/winbuild/fluidsynth/fluidsynth.dsp b/src/unused/winbuild/fluidsynth/fluidsynth.dsp similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth/fluidsynth.dsp rename to src/unused/winbuild/fluidsynth/fluidsynth.dsp diff --git a/fluidsynth/src/unused/winbuild/fluidsynth/fluidsynth.vcproj b/src/unused/winbuild/fluidsynth/fluidsynth.vcproj similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth/fluidsynth.vcproj rename to src/unused/winbuild/fluidsynth/fluidsynth.vcproj diff --git a/fluidsynth/src/unused/winbuild/fluidsynth_dll/Makefile.am b/src/unused/winbuild/fluidsynth_dll/Makefile.am similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth_dll/Makefile.am rename to src/unused/winbuild/fluidsynth_dll/Makefile.am diff --git a/fluidsynth/src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.dsp b/src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.dsp similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.dsp rename to src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.dsp diff --git a/fluidsynth/src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj b/src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj rename to src/unused/winbuild/fluidsynth_dll/fluidsynth_dll.vcproj diff --git a/fluidsynth/src/unused/winbuild/fluidsynth_lib/Makefile.am b/src/unused/winbuild/fluidsynth_lib/Makefile.am similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth_lib/Makefile.am rename to src/unused/winbuild/fluidsynth_lib/Makefile.am diff --git a/fluidsynth/src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.dsp b/src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.dsp similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.dsp rename to src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.dsp diff --git a/fluidsynth/src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj b/src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj similarity index 100% rename from fluidsynth/src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj rename to src/unused/winbuild/fluidsynth_lib/fluidsynth_lib.vcproj diff --git a/fluidsynth/src/utils/fluid_conv.c b/src/utils/fluid_conv.c similarity index 100% rename from fluidsynth/src/utils/fluid_conv.c rename to src/utils/fluid_conv.c diff --git a/fluidsynth/src/utils/fluid_conv.h b/src/utils/fluid_conv.h similarity index 100% rename from fluidsynth/src/utils/fluid_conv.h rename to src/utils/fluid_conv.h diff --git a/fluidsynth/src/utils/fluid_hash.c b/src/utils/fluid_hash.c similarity index 100% rename from fluidsynth/src/utils/fluid_hash.c rename to src/utils/fluid_hash.c diff --git a/fluidsynth/src/utils/fluid_hash.h b/src/utils/fluid_hash.h similarity index 100% rename from fluidsynth/src/utils/fluid_hash.h rename to src/utils/fluid_hash.h diff --git a/fluidsynth/src/utils/fluid_list.c b/src/utils/fluid_list.c similarity index 100% rename from fluidsynth/src/utils/fluid_list.c rename to src/utils/fluid_list.c diff --git a/fluidsynth/src/utils/fluid_list.h b/src/utils/fluid_list.h similarity index 100% rename from fluidsynth/src/utils/fluid_list.h rename to src/utils/fluid_list.h diff --git a/fluidsynth/src/utils/fluid_ringbuffer.c b/src/utils/fluid_ringbuffer.c similarity index 100% rename from fluidsynth/src/utils/fluid_ringbuffer.c rename to src/utils/fluid_ringbuffer.c diff --git a/fluidsynth/src/utils/fluid_ringbuffer.h b/src/utils/fluid_ringbuffer.h similarity index 100% rename from fluidsynth/src/utils/fluid_ringbuffer.h rename to src/utils/fluid_ringbuffer.h diff --git a/fluidsynth/src/utils/fluid_settings.c b/src/utils/fluid_settings.c similarity index 100% rename from fluidsynth/src/utils/fluid_settings.c rename to src/utils/fluid_settings.c diff --git a/fluidsynth/src/utils/fluid_settings.h b/src/utils/fluid_settings.h similarity index 100% rename from fluidsynth/src/utils/fluid_settings.h rename to src/utils/fluid_settings.h diff --git a/fluidsynth/src/utils/fluid_sys.c b/src/utils/fluid_sys.c similarity index 100% rename from fluidsynth/src/utils/fluid_sys.c rename to src/utils/fluid_sys.c diff --git a/fluidsynth/src/utils/fluid_sys.h b/src/utils/fluid_sys.h similarity index 100% rename from fluidsynth/src/utils/fluid_sys.h rename to src/utils/fluid_sys.h diff --git a/fluidsynth/src/utils/fluidsynth_priv.h b/src/utils/fluidsynth_priv.h similarity index 100% rename from fluidsynth/src/utils/fluidsynth_priv.h rename to src/utils/fluidsynth_priv.h