Merge branch 'release/2.3' into master

FluidSynth · Oct 31, 2024 · 51affbd · 51affbd
2 parents c43f4da + b01ecad
commit 51affbd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ set ( PACKAGE "fluidsynth" )
 # FluidSynth package version
 set ( FLUIDSYNTH_VERSION_MAJOR 2 )
 set ( FLUIDSYNTH_VERSION_MINOR 3 )
-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}\"" )
 
@@ -62,7 +62,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 3 )
 set ( LIB_VERSION_AGE 2 )
-set ( LIB_VERSION_REVISION 4 )
+set ( LIB_VERSION_REVISION 5 )
 set ( LIB_VERSION_INFO
       "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
 

diff --git a/doc/fluidsynth-v20-devdoc.txt b/doc/fluidsynth-v20-devdoc.txt
@@ -7,9 +7,9 @@
 \author Josh Green
 \author David Henningsson
 \author Tom Moebert
-\author Copyright &copy; 2003-2023 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert
-\version Revision 2.3.6
-\date 2024-08-03
+\author Copyright &copy; 2003-2024 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert
+\version Revision 2.3.7
+\date 2024-10-20
 
 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 https://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 https://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.
 

diff --git a/src/drivers/fluid_oboe.cpp b/src/drivers/fluid_oboe.cpp
@@ -46,7 +46,7 @@ class OboeAudioStreamErrorCallback;
  * This structure should not be accessed directly. Use audio port
  * functions instead.
  */
-typedef struct
+struct fluid_oboe_audio_driver_t
 {
     fluid_audio_driver_t driver;
     fluid_synth_t *synth = nullptr;
@@ -62,7 +62,7 @@ typedef struct
     int performance_mode; // 0: None, 1: PowerSaving, 2: LowLatency
     oboe::SampleRateConversionQuality srate_conversion_quality;
     int error_recovery_mode; // 0: Reconnect, 1: Stop
-} fluid_oboe_audio_driver_t;
+};
 
 
 class OboeAudioStreamCallback : public AudioStreamCallback

diff --git a/src/midi/fluid_midi.c b/src/midi/fluid_midi.c
@@ -363,8 +363,7 @@ fluid_midi_file_read_mthd(fluid_midi_file *mf)
                   "Sorry, but MIDI Format %d is not supported by this player", mf->type);
         return FLUID_FAILED;
     }
-    mf->ntracks = (unsigned) mthd[11];
-    mf->ntracks += (unsigned int)(mthd[10]) << 16;
+    mf->ntracks = (signed)((unsigned)(mthd[10]) << 8 | (unsigned) mthd[11]);
 
     if((signed char)mthd[12] < 0)
     {