API tools faq
paste
wyatt8740

SDL fluidsynth soundfonts patch

wyatt8740
Feb 2nd, 2015
403
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 35.03 KB | None | 0 0
raw download clone embed print report
  1. # HG changeset patch
  2. # User James Le Cuirot <[email protected]>
  3. # Date 1300631658 0
  4. # Node ID 586ae09f8176d138751c694636c169d016b0fb66
  5. # Parent  5b24d089d9f5577d5cce615da0b523c31216b8ac
  6. Add FluidSynth backend and generic SoundFont functions. No FluidSynth DLL or headers for MSVC in this commit.
  7.  
  8. diff -r 5b24d089d9f5 -r 586ae09f8176 Makefile.in
  9. --- a/Makefile.in   Tue Mar 15 23:11:29 2011 -0700
  10. +++ b/Makefile.in   Sun Mar 20 14:34:18 2011 +0000
  11. @@ -39,7 +39,7 @@
  12.  PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
  13.  PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
  14.  
  15. -DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC.zip Watcom-OS2.zip Xcode.tar.gz acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi native_midi_gpl playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
  16. +DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC.zip Watcom-OS2.zip Xcode.tar.gz acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi native_midi_gpl playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
  17.  
  18.  LT_AGE      = @LT_AGE@
  19.  LT_CURRENT  = @LT_CURRENT@
  20. diff -r 5b24d089d9f5 -r 586ae09f8176 SDL_mixer.h
  21. --- a/SDL_mixer.h   Tue Mar 15 23:11:29 2011 -0700
  22. +++ b/SDL_mixer.h   Sun Mar 20 14:34:18 2011 +0000
  23. @@ -67,10 +67,11 @@
  24.  
  25.  typedef enum
  26.  {
  27. -    MIX_INIT_FLAC = 0x00000001,
  28. -    MIX_INIT_MOD  = 0x00000002,
  29. -    MIX_INIT_MP3  = 0x00000004,
  30. -    MIX_INIT_OGG  = 0x00000008
  31. +    MIX_INIT_FLAC        = 0x00000001,
  32. +    MIX_INIT_MOD         = 0x00000002,
  33. +    MIX_INIT_MP3         = 0x00000004,
  34. +    MIX_INIT_OGG         = 0x00000008,
  35. +    MIX_INIT_FLUIDSYNTH  = 0x00000016
  36.  } MIX_InitFlags;
  37.  
  38.  /* Loads dynamic libraries and prepares them for use.  Flags should be
  39. @@ -605,6 +606,11 @@
  40.  extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
  41.  extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);
  42.  
  43. +/* Set/Get/Iterate SoundFonts paths to use by supported MIDI backends */
  44. +extern DECLSPEC int SDLCALL Mix_SetSoundFonts(const char *paths);
  45. +extern DECLSPEC const char* SDLCALL Mix_GetSoundFonts();
  46. +extern DECLSPEC int SDLCALL Mix_EachSoundFont(int (*function)(const char*, void*), void *data);
  47. +
  48.  /* Get the Mix_Chunk currently associated with a mixer channel
  49.      Returns NULL if it's an invalid channel, or there's no chunk associated.
  50.  */
  51. diff -r 5b24d089d9f5 -r 586ae09f8176 VisualC/SDL_mixer.dsp
  52. --- a/VisualC/SDL_mixer.dsp Tue Mar 15 23:11:29 2011 -0700
  53. +++ b/VisualC/SDL_mixer.dsp Sun Mar 20 14:34:18 2011 +0000
  54. @@ -44,7 +44,7 @@
  55.  # PROP Ignore_Export_Lib 0
  56.  # PROP Target_Dir ""
  57.  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  58. -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\mikmod" /I "..\timidity" /I "..\native_midi" /I "vorbis\include" /I "smpeg\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WAV_MUSIC" /D "MOD_MUSIC" /D MOD_DYNAMIC=\"mikmod.dll\" /D "MID_MUSIC" /D "USE_TIMIDITY_MIDI" /D "USE_NATIVE_MIDI" /D "OGG_MUSIC" /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" /D "MP3_MUSIC" /D MP3_DYNAMIC=\"smpeg.dll\" /YX /FD /c
  59. +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\mikmod" /I "..\timidity" /I "..\native_midi" /I "fluidsynth\include" /I "vorbis\include" /I "smpeg\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WAV_MUSIC" /D "MOD_MUSIC" /D MOD_DYNAMIC=\"mikmod.dll\" /D "MID_MUSIC" /D "USE_TIMIDITY_MIDI" /D "USE_NATIVE_MIDI" /D "USE_FLUIDSYNTH_MIDI" /D FLUIDSYNTH_DYNAMIC=\"libfluidsynth.dll\" /D "OGG_MUSIC" /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" /D "MP3_MUSIC" /D MP3_DYNAMIC=\"smpeg.dll\" /YX /FD /c
  60.  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  61.  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  62.  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  63. @@ -70,7 +70,7 @@
  64.  # PROP Ignore_Export_Lib 0
  65.  # PROP Target_Dir ""
  66.  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  67. -# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\mikmod" /I "..\timidity" /I "..\native_midi" /I "vorbis\include" /I "smpeg\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WAV_MUSIC" /D "MOD_MUSIC" /D MOD_DYNAMIC=\"mikmod.dll\" /D MOD_DYNAMIC=\"mikmod.dll\" /D "MID_MUSIC" /D "USE_TIMIDITY_MIDI" /D "USE_NATIVE_MIDI" /D "OGG_MUSIC" /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" /D "MP3_MUSIC" /D MP3_DYNAMIC=\"smpeg.dll\" /YX /FD /c
  68. +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\mikmod" /I "..\timidity" /I "..\native_midi" /I "fluidsynth\include" /I "vorbis\include" /I "smpeg\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WAV_MUSIC" /D "MOD_MUSIC" /D MOD_DYNAMIC=\"mikmod.dll\" /D MOD_DYNAMIC=\"mikmod.dll\" /D "MID_MUSIC" /D "USE_TIMIDITY_MIDI" /D "USE_NATIVE_MIDI" /D "USE_FLUIDSYNTH_MIDI" /D FLUIDSYNTH_DYNAMIC=\"libfluidsynth.dll\" /D "OGG_MUSIC" /D OGG_DYNAMIC=\"libvorbisfile-3.dll\" /D "MP3_MUSIC" /D MP3_DYNAMIC=\"smpeg.dll\" /YX /FD /c
  69.  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  70.  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  71.  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  72. @@ -98,6 +98,14 @@
  73.  # End Source File
  74.  # Begin Source File
  75.  
  76. +SOURCE=..\dynamic_fluidsynth.c
  77. +# End Source File
  78. +# Begin Source File
  79. +
  80. +SOURCE=..\dynamic_fluidsynth.h
  81. +# End Source File
  82. +# Begin Source File
  83. +
  84.  SOURCE=..\dynamic_mod.c
  85.  # End Source File
  86.  # Begin Source File
  87. @@ -138,6 +146,14 @@
  88.  # End Source File
  89.  # Begin Source File
  90.  
  91. +SOURCE=..\fluidsynth.c
  92. +# End Source File
  93. +# Begin Source File
  94. +
  95. +SOURCE=..\fluidsynth.h
  96. +# End Source File
  97. +# Begin Source File
  98. +
  99.  SOURCE=..\load_aiff.c
  100.  # End Source File
  101.  # Begin Source File
  102. diff -r 5b24d089d9f5 -r 586ae09f8176 VisualC/SDL_mixer.vcproj
  103. --- a/VisualC/SDL_mixer.vcproj  Tue Mar 15 23:11:29 2011 -0700
  104. +++ b/VisualC/SDL_mixer.vcproj  Sun Mar 20 14:34:18 2011 +0000
  105. @@ -48,8 +48,8 @@
  106.                 Name="VCCLCompilerTool"
  107.                 AdditionalOptions="/D OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;"
  108.                 Optimization="0"
  109. -               AdditionalIncludeDirectories="..\timidity;..\native_midi;mikmod\include;smpeg\include;vorbis\include"
  110. -               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;mikmod.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;"
  111. +               AdditionalIncludeDirectories="..\timidity;..\native_midi;fluidsynth\include;mikmod\include;smpeg\include;vorbis\include"
  112. +               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;mikmod.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;USE_FLUIDSYNTH_MIDI;FLUIDSYNTH_DYNAMIC=\&quot;libfluidsynth.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;"
  113.                 MinimalRebuild="true"
  114.                 RuntimeLibrary="2"
  115.                 PrecompiledHeaderFile=".\Debug/SDL_mixer.pch"
  116. @@ -145,8 +145,8 @@
  117.                 AdditionalOptions="/D OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;"
  118.                 Optimization="2"
  119.                 InlineFunctionExpansion="1"
  120. -               AdditionalIncludeDirectories="..\timidity;..\native_midi;mikmod\include;smpeg\include;vorbis\include"
  121. -               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MID_MUSIC;MOD_DYNAMIC=\&quot;mikmod.dll\&quot;;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;"
  122. +               AdditionalIncludeDirectories="..\timidity;..\native_midi;fluidsynth/include;mikmod\include;smpeg\include;vorbis\include"
  123. +               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MID_MUSIC;MOD_DYNAMIC=\&quot;mikmod.dll\&quot;;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;USE_FLUIDSYNTH_MIDI;FLUIDSYNTH_DYNAMIC=\&quot;libfluidsynth.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;"
  124.                 StringPooling="true"
  125.                 RuntimeLibrary="2"
  126.                 EnableFunctionLevelLinking="true"
  127. @@ -219,6 +219,14 @@
  128.             >
  129.         </File>
  130.         <File
  131. +           RelativePath="..\dynamic_fluidsynth.c"
  132. +           >
  133. +       </File>
  134. +       <File
  135. +           RelativePath="..\dynamic_fluidsynth.h"
  136. +           >
  137. +       </File>
  138. +       <File
  139.             RelativePath="..\dynamic_mod.c"
  140.             >
  141.         </File>
  142. @@ -349,6 +357,14 @@
  143.             >
  144.         </File>
  145.         <File
  146. +           RelativePath="..\fluidsynth.c"
  147. +           >
  148. +       </File>
  149. +       <File
  150. +           RelativePath="..\fluidsynth.h"
  151. +           >
  152. +       </File>
  153. +       <File
  154.             RelativePath="..\load_aiff.c"
  155.             >
  156.             <FileConfiguration
  157. diff -r 5b24d089d9f5 -r 586ae09f8176 configure.in
  158. --- a/configure.in  Tue Mar 15 23:11:29 2011 -0700
  159. +++ b/configure.in  Sun Mar 20 14:34:18 2011 +0000
  160. @@ -387,6 +387,49 @@
  161.              SOURCES="$SOURCES $srcdir/native_midi_gpl/*.c"
  162.          fi
  163.      fi
  164. +    AC_ARG_ENABLE([music-fluidsynth-midi],
  165. +AC_HELP_STRING([--enable-music-fluidsynth-midi], [enable FluidSynth MIDI output [[default=yes]]]),
  166. +                  [], [enable_music_fluidsynth_midi=yes])
  167. +    AC_ARG_ENABLE([music-fluidsynth-shared],
  168. +AC_HELP_STRING([--enable-music-fluidsynth-shared], [dynamically load FluidSynth support [[default=yes]]]),
  169. +                  [], [enable_music_fluidsynth_shared=yes])
  170. +    if test x$enable_music_fluidsynth_midi = xyes; then
  171. +        AC_CHECK_HEADER([fluidsynth.h], [have_fluidsynth_hdr=yes])
  172. +        AC_CHECK_LIB([fluidsynth], [fluid_player_add_mem], [have_fluidsynth_lib=yes])
  173. +        if test x$have_fluidsynth_hdr = xyes -a x$have_fluidsynth_lib = xyes; then
  174. +            case "$host" in
  175. +                *-*-darwin*)
  176. +                    fluidsynth_lib=[`find_lib libfluidsynth.dylib`]
  177. +                    if test x$fluidsynth_lib = x; then
  178. +                        fluidsynth_lib=[`find_lib libfluidsynth.[0-9]`]
  179. +                    fi
  180. +                    if test x$fluidsynth_lib = x; then
  181. +                        fluidsynth_lib=[`find_lib libfluidsynth.[0-9]*`]
  182. +                    fi
  183. +                    ;;
  184. +                *-*-cygwin* | *-*-mingw32*)
  185. +                    fluidsynth_lib=[`find_lib "fluidsynth*.dll"`]
  186. +                    ;;
  187. +                *)
  188. +                    fluidsynth_lib=[`find_lib "libfluidsynth.so.[0-9]"`]
  189. +                    if test x$fluidsynth_lib = x; then
  190. +                        fluidsynth_lib=[`find_lib "libfluidsynth.so.[0-9]*"`]
  191. +                    fi
  192. +                    ;;
  193. +            esac
  194. +            SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
  195. +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
  196. +            if test x$enable_music_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
  197. +                echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
  198. +                EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLUIDSYNTH_DYNAMIC=\\\"$fluidsynth_lib\\\""
  199. +            else
  200. +                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lfluidsynth"
  201. +            fi
  202. +        else
  203. +            AC_MSG_WARN([*** Unable to find FluidSynth library (http://www.fluidsynth.org/)])
  204. +            AC_MSG_WARN([FluidSynth support disabled])
  205. +        fi
  206. +    fi
  207.  fi
  208.  
  209.  AC_ARG_ENABLE([music-ogg],
  210. diff -r 5b24d089d9f5 -r 586ae09f8176 dynamic_fluidsynth.c
  211. --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
  212. +++ b/dynamic_fluidsynth.c  Sun Mar 20 14:34:18 2011 +0000
  213. @@ -0,0 +1,85 @@
  214. +/*
  215. +    SDL_mixer:  An audio mixer library based on the SDL library
  216. +    Copyright (C) 1997-2011 Sam Lantinga
  217. +
  218. +    This library is free software; you can redistribute it and/or
  219. +    modify it under the terms of the GNU Library General Public
  220. +    License as published by the Free Software Foundation; either
  221. +    version 2 of the License, or (at your option) any later version.
  222. +
  223. +    This library is distributed in the hope that it will be useful,
  224. +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  225. +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  226. +    Library General Public License for more details.
  227. +
  228. +    You should have received a copy of the GNU Library General Public
  229. +    License along with this library; if not, write to the Free
  230. +    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  231. +
  232. +    James Le Cuirot
  233. +    [email protected]
  234. +*/
  235. +
  236. +#ifdef USE_FLUIDSYNTH_MIDI
  237. +
  238. +#include "SDL_loadso.h"
  239. +#include "dynamic_fluidsynth.h"
  240. +
  241. +fluidsynth_loader fluidsynth = {
  242. +   0, NULL
  243. +};
  244. +
  245. +#ifdef FLUIDSYNTH_DYNAMIC
  246. +#define FLUIDSYNTH_LOADER(FUNC, SIG) \
  247. +   fluidsynth.FUNC = (SIG) SDL_LoadFunction(fluidsynth.handle, #FUNC); \
  248. +   if (fluidsynth.FUNC == NULL) { SDL_UnloadObject(fluidsynth.handle); return -1; }
  249. +#else
  250. +#define FLUIDSYNTH_LOADER(FUNC, SIG) \
  251. +   fluidsynth.FUNC = FUNC;
  252. +#endif
  253. +
  254. +int Mix_InitFluidSynth()
  255. +{
  256. +   if ( fluidsynth.loaded == 0 ) {
  257. +#ifdef FLUIDSYNTH_DYNAMIC
  258. +       fluidsynth.handle = SDL_LoadObject(FLUIDSYNTH_DYNAMIC);
  259. +       if ( fluidsynth.handle == NULL ) return -1;
  260. +#endif
  261. +
  262. +       FLUIDSYNTH_LOADER(delete_fluid_player, int (*)(fluid_player_t*));
  263. +       FLUIDSYNTH_LOADER(delete_fluid_settings, void (*)(fluid_settings_t*));
  264. +       FLUIDSYNTH_LOADER(delete_fluid_synth, int (*)(fluid_synth_t*));
  265. +       FLUIDSYNTH_LOADER(fluid_player_add, int (*)(fluid_player_t*, const char*));
  266. +       FLUIDSYNTH_LOADER(fluid_player_add_mem, int (*)(fluid_player_t*, const void*, size_t));
  267. +       FLUIDSYNTH_LOADER(fluid_player_get_status, int (*)(fluid_player_t*));
  268. +       FLUIDSYNTH_LOADER(fluid_player_play, int (*)(fluid_player_t*));
  269. +       FLUIDSYNTH_LOADER(fluid_player_set_loop, int (*)(fluid_player_t*, int));
  270. +       FLUIDSYNTH_LOADER(fluid_player_stop, int (*)(fluid_player_t*));
  271. +       FLUIDSYNTH_LOADER(fluid_settings_setnum, int (*)(fluid_settings_t*, const char*, double));
  272. +       FLUIDSYNTH_LOADER(fluid_synth_get_settings, fluid_settings_t* (*)(fluid_synth_t*));
  273. +       FLUIDSYNTH_LOADER(fluid_synth_set_gain, void (*)(fluid_synth_t*, float));
  274. +       FLUIDSYNTH_LOADER(fluid_synth_sfload, int(*)(fluid_synth_t*, const char*, int));
  275. +       FLUIDSYNTH_LOADER(fluid_synth_write_s16, int(*)(fluid_synth_t*, int, void*, int, int, void*, int, int));
  276. +       FLUIDSYNTH_LOADER(new_fluid_player, fluid_player_t* (*)(fluid_synth_t*));
  277. +       FLUIDSYNTH_LOADER(new_fluid_settings, fluid_settings_t* (*)(void));
  278. +       FLUIDSYNTH_LOADER(new_fluid_synth, fluid_synth_t* (*)(fluid_settings_t*));
  279. +   }
  280. +   ++fluidsynth.loaded;
  281. +
  282. +   return 0;
  283. +}
  284. +
  285. +void Mix_QuitFluidSynth()
  286. +{
  287. +   if ( fluidsynth.loaded == 0 ) {
  288. +       return;
  289. +   }
  290. +   if ( fluidsynth.loaded == 1 ) {
  291. +#ifdef FLUIDSYNTH_DYNAMIC
  292. +       SDL_UnloadObject(fluidsynth.handle);
  293. +#endif
  294. +   }
  295. +   --fluidsynth.loaded;
  296. +}
  297. +
  298. +#endif /* USE_FLUIDSYNTH_MIDI */
  299. diff -r 5b24d089d9f5 -r 586ae09f8176 dynamic_fluidsynth.h
  300. --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
  301. +++ b/dynamic_fluidsynth.h  Sun Mar 20 14:34:18 2011 +0000
  302. @@ -0,0 +1,55 @@
  303. +/*
  304. +    SDL_mixer:  An audio mixer library based on the SDL library
  305. +    Copyright (C) 1997-2011 Sam Lantinga
  306. +
  307. +    This library is free software; you can redistribute it and/or
  308. +    modify it under the terms of the GNU Library General Public
  309. +    License as published by the Free Software Foundation; either
  310. +    version 2 of the License, or (at your option) any later version.
  311. +
  312. +    This library is distributed in the hope that it will be useful,
  313. +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  314. +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  315. +    Library General Public License for more details.
  316. +
  317. +    You should have received a copy of the GNU Library General Public
  318. +    License along with this library; if not, write to the Free
  319. +    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  320. +
  321. +    James Le Cuirot
  322. +    [email protected]
  323. +*/
  324. +
  325. +#ifdef USE_FLUIDSYNTH_MIDI
  326. +
  327. +#include <fluidsynth.h>
  328. +
  329. +typedef struct {
  330. +   int loaded;
  331. +   void *handle;
  332. +
  333. +   int (*delete_fluid_player)(fluid_player_t*);
  334. +   void (*delete_fluid_settings)(fluid_settings_t*);
  335. +   int (*delete_fluid_synth)(fluid_synth_t*);
  336. +   int (*fluid_player_add)(fluid_player_t*, const char*);
  337. +   int (*fluid_player_add_mem)(fluid_player_t*, const void*, size_t);
  338. +   int (*fluid_player_get_status)(fluid_player_t*);
  339. +   int (*fluid_player_play)(fluid_player_t*);
  340. +   int (*fluid_player_set_loop)(fluid_player_t*, int);
  341. +   int (*fluid_player_stop)(fluid_player_t*);
  342. +   int (*fluid_settings_setnum)(fluid_settings_t*, const char*, double);
  343. +   fluid_settings_t* (*fluid_synth_get_settings)(fluid_synth_t*);
  344. +   void (*fluid_synth_set_gain)(fluid_synth_t*, float);
  345. +   int (*fluid_synth_sfload)(fluid_synth_t*, const char*, int);
  346. +   int (*fluid_synth_write_s16)(fluid_synth_t*, int, void*, int, int, void*, int, int);
  347. +   fluid_player_t* (*new_fluid_player)(fluid_synth_t*);
  348. +   fluid_settings_t* (*new_fluid_settings)(void);
  349. +   fluid_synth_t* (*new_fluid_synth)(fluid_settings_t*);
  350. +} fluidsynth_loader;
  351. +
  352. +extern fluidsynth_loader fluidsynth;
  353. +
  354. +#endif /* USE_FLUIDSYNTH_MIDI */
  355. +
  356. +extern int Mix_InitFluidSynth();
  357. +extern void Mix_QuitFluidSynth();
  358. diff -r 5b24d089d9f5 -r 586ae09f8176 fluidsynth.c
  359. --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
  360. +++ b/fluidsynth.c  Sun Mar 20 14:34:18 2011 +0000
  361. @@ -0,0 +1,222 @@
  362. +/*
  363. +    SDL_mixer:  An audio mixer library based on the SDL library
  364. +    Copyright (C) 1997-2011 Sam Lantinga
  365. +
  366. +    This library is free software; you can redistribute it and/or
  367. +    modify it under the terms of the GNU Library General Public
  368. +    License as published by the Free Software Foundation; either
  369. +    version 2 of the License, or (at your option) any later version.
  370. +
  371. +    This library is distributed in the hope that it will be useful,
  372. +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  373. +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  374. +    Library General Public License for more details.
  375. +
  376. +    You should have received a copy of the GNU Library General Public
  377. +    License along with this library; if not, write to the Free
  378. +    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  379. +
  380. +    James Le Cuirot
  381. +    [email protected]
  382. +*/
  383. +
  384. +#include "fluidsynth.h"
  385. +#include "SDL_mixer.h"
  386. +#include <stdio.h>
  387. +#include <sys/types.h>
  388. +
  389. +static Uint16 format;
  390. +static Uint8 channels;
  391. +static int freq;
  392. +
  393. +int fluidsynth_check_soundfont(const char *path, void *data)
  394. +{
  395. +   FILE *file = fopen(path, "r");
  396. +
  397. +   if (file) {
  398. +       fclose(file);
  399. +       return 1;
  400. +   } else {
  401. +       Mix_SetError("Failed to access the SoundFont %s", path);
  402. +       return 0;
  403. +   }
  404. +}
  405. +
  406. +int fluidsynth_load_soundfont(const char *path, void *data)
  407. +{
  408. +   /* If this fails, it's too late to try Timidity so pray that at least one works. */
  409. +   fluidsynth.fluid_synth_sfload((fluid_synth_t*) data, path, 1);
  410. +   return 1;
  411. +}
  412. +
  413. +int fluidsynth_init(SDL_AudioSpec *mixer)
  414. +{
  415. +   if (!Mix_EachSoundFont(fluidsynth_check_soundfont, NULL))
  416. +       return -1;
  417. +
  418. +   format = mixer->format;
  419. +   channels = mixer->channels;
  420. +   freq = mixer->freq;
  421. +
  422. +   return 0;
  423. +}
  424. +
  425. +FluidSynthMidiSong *fluidsynth_loadsong_common(int (*function)(FluidSynthMidiSong*, void*), void *data)
  426. +{
  427. +   FluidSynthMidiSong *song;
  428. +   fluid_settings_t *settings = NULL;
  429. +
  430. +   if ((song = malloc(sizeof(FluidSynthMidiSong)))) {
  431. +       memset(song, 0, sizeof(FluidSynthMidiSong));
  432. +
  433. +       if (SDL_BuildAudioCVT(&song->convert, AUDIO_S16, 2, freq, format, channels, freq) >= 0) {
  434. +           if ((settings = fluidsynth.new_fluid_settings())) {
  435. +               fluidsynth.fluid_settings_setnum(settings, "synth.sample-rate", (double) freq);
  436. +
  437. +               if ((song->synth = fluidsynth.new_fluid_synth(settings))) {
  438. +                   if (Mix_EachSoundFont(fluidsynth_load_soundfont, (void*) song->synth)) {
  439. +                       if ((song->player = fluidsynth.new_fluid_player(song->synth))) {
  440. +                           if (function(song, data)) return song;
  441. +                           fluidsynth.delete_fluid_player(song->player);
  442. +                       } else {
  443. +                           Mix_SetError("Failed to create FluidSynth player");
  444. +                       }
  445. +                   }
  446. +                   fluidsynth.delete_fluid_synth(song->synth);
  447. +               } else {
  448. +                   Mix_SetError("Failed to create FluidSynth synthesizer");
  449. +               }
  450. +               fluidsynth.delete_fluid_settings(settings);
  451. +           } else {
  452. +               Mix_SetError("Failed to create FluidSynth settings");
  453. +           }
  454. +       } else {
  455. +           Mix_SetError("Failed to set up audio conversion");
  456. +       }
  457. +       free(song);
  458. +   } else {
  459. +       Mix_SetError("Insufficient memory for song");
  460. +   }
  461. +   return NULL;
  462. +}
  463. +
  464. +int fluidsynth_loadsong_internal(FluidSynthMidiSong *song, void *data)
  465. +{
  466. +   const char* path = (const char*) data;
  467. +
  468. +   if (fluidsynth.fluid_player_add(song->player, path) == FLUID_OK) {
  469. +       return 1;
  470. +   } else {
  471. +       Mix_SetError("FluidSynth failed to load %s", path);
  472. +       return 0;
  473. +   }
  474. +}
  475. +
  476. +int fluidsynth_loadsong_RW_internal(FluidSynthMidiSong *song, void *data)
  477. +{
  478. +   off_t offset;
  479. +   size_t size;
  480. +   char *buffer;
  481. +   SDL_RWops *rw = (SDL_RWops*) data;
  482. +
  483. +   offset = SDL_RWtell(rw);
  484. +   SDL_RWseek(rw, 0, RW_SEEK_END);
  485. +   size = SDL_RWtell(rw) - offset;
  486. +   SDL_RWseek(rw, offset, RW_SEEK_SET);
  487. +
  488. +   if ((buffer = (char*) malloc(size))) {
  489. +       if(SDL_RWread(rw, buffer, size, 1) == 1) {
  490. +           if (fluidsynth.fluid_player_add_mem(song->player, buffer, size) == FLUID_OK) {
  491. +               return 1;
  492. +           } else {
  493. +               Mix_SetError("FluidSynth failed to load in-memory song");
  494. +           }
  495. +       } else {
  496. +           Mix_SetError("Failed to read in-memory song");
  497. +       }
  498. +       free(buffer);
  499. +   } else {
  500. +       Mix_SetError("Insufficient memory for song");
  501. +   }
  502. +   return 0;
  503. +}
  504. +
  505. +FluidSynthMidiSong *fluidsynth_loadsong(const char *midifile)
  506. +{
  507. +   return fluidsynth_loadsong_common(fluidsynth_loadsong_internal, (void*) midifile);
  508. +}
  509. +
  510. +FluidSynthMidiSong *fluidsynth_loadsong_RW(SDL_RWops *rw)
  511. +{
  512. +   return fluidsynth_loadsong_common(fluidsynth_loadsong_RW_internal, (void*) rw);
  513. +}
  514. +
  515. +void fluidsynth_freesong(FluidSynthMidiSong *song)
  516. +{
  517. +   if (!song) return;
  518. +   fluidsynth.delete_fluid_player(song->player);
  519. +   fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(song->synth));
  520. +   fluidsynth.delete_fluid_synth(song->synth);
  521. +   free(song);
  522. +}
  523. +
  524. +void fluidsynth_start(FluidSynthMidiSong *song)
  525. +{
  526. +   fluidsynth.fluid_player_set_loop(song->player, 1);
  527. +   fluidsynth.fluid_player_play(song->player);
  528. +}
  529. +
  530. +void fluidsynth_stop(FluidSynthMidiSong *song)
  531. +{
  532. +   fluidsynth.fluid_player_stop(song->player);
  533. +}
  534. +
  535. +int fluidsynth_active(FluidSynthMidiSong *song)
  536. +{
  537. +   return fluidsynth.fluid_player_get_status(song->player) == FLUID_PLAYER_PLAYING ? 1 : 0;
  538. +}
  539. +
  540. +void fluidsynth_setvolume(FluidSynthMidiSong *song, int volume)
  541. +{
  542. +   /* FluidSynth's default is 0.2. Make 0.8 the maximum. */
  543. +   fluidsynth.fluid_synth_set_gain(song->synth, (float) (volume * 0.00625));
  544. +}
  545. +
  546. +int fluidsynth_playsome(FluidSynthMidiSong *song, void *dest, int dest_len)
  547. +{
  548. +   int result = -1;
  549. +   int frames = dest_len / channels / ((format & 0xFF) / 8);
  550. +   int src_len = frames * 4; /* 16-bit stereo */
  551. +   void *src = dest;
  552. +
  553. +   if (dest_len < src_len) {
  554. +       if (!(src = malloc(src_len))) {
  555. +           Mix_SetError("Insufficient memory for audio conversion");
  556. +           return result;
  557. +       }
  558. +   }
  559. +
  560. +   if (fluidsynth.fluid_synth_write_s16(song->synth, frames, src, 0, 2, src, 1, 2) != FLUID_OK) {
  561. +       Mix_SetError("Error generating FluidSynth audio");
  562. +       goto finish;
  563. +   }
  564. +
  565. +   song->convert.buf = src;
  566. +   song->convert.len = src_len;
  567. +
  568. +   if (SDL_ConvertAudio(&song->convert) < 0) {
  569. +       Mix_SetError("Error during audio conversion");
  570. +       goto finish;
  571. +   }
  572. +
  573. +   if (src != dest)
  574. +       memcpy(dest, src, dest_len);
  575. +
  576. +   result = 0;
  577. +
  578. +finish:
  579. +   if (src != dest)
  580. +       free(src);
  581. +
  582. +   return result;
  583. +}
  584. diff -r 5b24d089d9f5 -r 586ae09f8176 fluidsynth.h
  585. --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
  586. +++ b/fluidsynth.h  Sun Mar 20 14:34:18 2011 +0000
  587. @@ -0,0 +1,46 @@
  588. +/*
  589. +    SDL_mixer:  An audio mixer library based on the SDL library
  590. +    Copyright (C) 1997-2011 Sam Lantinga
  591. +
  592. +    This library is free software; you can redistribute it and/or
  593. +    modify it under the terms of the GNU Library General Public
  594. +    License as published by the Free Software Foundation; either
  595. +    version 2 of the License, or (at your option) any later version.
  596. +
  597. +    This library is distributed in the hope that it will be useful,
  598. +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  599. +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  600. +    Library General Public License for more details.
  601. +
  602. +    You should have received a copy of the GNU Library General Public
  603. +    License along with this library; if not, write to the Free
  604. +    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  605. +
  606. +    James Le Cuirot
  607. +    [email protected]
  608. +*/
  609. +
  610. +#ifndef _FLUIDSYNTH_H_
  611. +#define _FLUIDSYNTH_H_
  612. +
  613. +#include "dynamic_fluidsynth.h"
  614. +#include <SDL_rwops.h>
  615. +#include <SDL_audio.h>
  616. +
  617. +typedef struct {
  618. +   SDL_AudioCVT convert;
  619. +   fluid_synth_t *synth;
  620. +   fluid_player_t* player;
  621. +} FluidSynthMidiSong;
  622. +
  623. +int fluidsynth_init(SDL_AudioSpec *mixer);
  624. +FluidSynthMidiSong *fluidsynth_loadsong(const char *midifile);
  625. +FluidSynthMidiSong *fluidsynth_loadsong_RW(SDL_RWops *rw);
  626. +void fluidsynth_freesong(FluidSynthMidiSong *song);
  627. +void fluidsynth_start(FluidSynthMidiSong *song);
  628. +void fluidsynth_stop(FluidSynthMidiSong *song);
  629. +int fluidsynth_active(FluidSynthMidiSong *song);
  630. +void fluidsynth_setvolume(FluidSynthMidiSong *song, int volume);
  631. +int fluidsynth_playsome(FluidSynthMidiSong *song, void *stream, int len);
  632. +
  633. +#endif /* _FLUIDSYNTH_H_ */
  634. diff -r 5b24d089d9f5 -r 586ae09f8176 mixer.c
  635. --- a/mixer.c   Tue Mar 15 23:11:29 2011 -0700
  636. +++ b/mixer.c   Sun Mar 20 14:34:18 2011 +0000
  637. @@ -107,6 +107,11 @@
  638.  static const char **chunk_decoders = NULL;
  639.  static int num_decoders = 0;
  640.  
  641. +/* Semicolon-separated SoundFont paths */
  642. +#ifdef MID_MUSIC
  643. +extern char* soundfont_paths;
  644. +#endif
  645. +
  646.  int Mix_GetNumChunkDecoders(void)
  647.  {
  648.     return(num_decoders);
  649. @@ -144,6 +149,15 @@
  650.  {
  651.     int result = 0;
  652.  
  653. +   if (flags & MIX_INIT_FLUIDSYNTH) {
  654. +#ifdef USE_FLUIDSYNTH_MIDI
  655. +       if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
  656. +           result |= MIX_INIT_FLUIDSYNTH;
  657. +       }
  658. +#else
  659. +       Mix_SetError("Mixer not built with FluidSynth support");
  660. +#endif
  661. +   }
  662.     if (flags & MIX_INIT_FLAC) {
  663.  #ifdef FLAC_MUSIC
  664.         if ((initialized & MIX_INIT_FLAC) || Mix_InitFLAC() == 0) {
  665. @@ -187,6 +201,11 @@
  666.  
  667.  void Mix_Quit()
  668.  {
  669. +#ifdef USE_FLUIDSYNTH_MIDI
  670. +   if (initialized & MIX_INIT_FLUIDSYNTH) {
  671. +       Mix_QuitFluidSynth();
  672. +   }
  673. +#endif
  674.  #ifdef FLAC_MUSIC
  675.     if (initialized & MIX_INIT_FLAC) {
  676.         Mix_QuitFLAC();
  677. @@ -207,6 +226,11 @@
  678.         Mix_QuitOgg();
  679.     }
  680.  #endif
  681. +#ifdef MID_MUSIC
  682. +   if (soundfont_paths) {
  683. +       free(soundfont_paths);
  684. +   }
  685. +#endif
  686.     initialized = 0;
  687.  }
  688.  
  689. diff -r 5b24d089d9f5 -r 586ae09f8176 music.c
  690. --- a/music.c   Tue Mar 15 23:11:29 2011 -0700
  691. +++ b/music.c   Sun Mar 20 14:34:18 2011 +0000
  692. @@ -48,14 +48,12 @@
  693.  #  ifdef USE_TIMIDITY_MIDI
  694.  #    include "timidity.h"
  695.  #  endif
  696. +#  ifdef USE_FLUIDSYNTH_MIDI
  697. +#    include "fluidsynth.h"
  698. +#  endif
  699.  #  ifdef USE_NATIVE_MIDI
  700.  #    include "native_midi.h"
  701.  #  endif
  702. -#  if defined(USE_TIMIDITY_MIDI) && defined(USE_NATIVE_MIDI)
  703. -#    define MIDI_ELSE  else
  704. -#  else
  705. -#    define MIDI_ELSE
  706. -#  endif
  707.  #endif
  708.  #ifdef OGG_MUSIC
  709.  #include "music_ogg.h"
  710. @@ -101,6 +99,9 @@
  711.  #ifdef USE_TIMIDITY_MIDI
  712.         MidiSong *midi;
  713.  #endif
  714. +#ifdef USE_FLUIDSYNTH_MIDI
  715. +       FluidSynthMidiSong *fluidsynthmidi;
  716. +#endif
  717.  #ifdef USE_NATIVE_MIDI
  718.         NativeMidiSong *nativemidi;
  719.  #endif
  720. @@ -128,6 +129,9 @@
  721.  static int timidity_ok;
  722.  static int samplesize;
  723.  #endif
  724. +#ifdef USE_FLUIDSYNTH_MIDI
  725. +static int fluidsynth_ok;
  726. +#endif
  727.  #ifdef USE_NATIVE_MIDI
  728.  static int native_midi_ok;
  729.  #endif
  730. @@ -140,6 +144,11 @@
  731.  static const char **music_decoders = NULL;
  732.  static int num_decoders = 0;
  733.  
  734. +/* Semicolon-separated SoundFont paths */
  735. +#ifdef MID_MUSIC
  736. +char* soundfont_paths = NULL;
  737. +#endif
  738. +
  739.  int Mix_GetNumMusicDecoders(void)
  740.  {
  741.     return(num_decoders);
  742. @@ -270,15 +279,22 @@
  743.                 break;
  744.  #endif
  745.  #ifdef MID_MUSIC
  746. +           case MUS_MID:
  747. +#ifdef USE_FLUIDSYNTH_MIDI
  748. +               if ( fluidsynth_ok ) {
  749. +                   fluidsynth_playsome(music_playing->data.fluidsynthmidi, stream, len);
  750. +                   goto skip;
  751. +               }
  752. +#endif
  753.  #ifdef USE_TIMIDITY_MIDI
  754. -           case MUS_MID:
  755.                 if ( timidity_ok ) {
  756.                     int samples = len / samplesize;
  757.                     Timidity_PlaySome(stream, samples);
  758. +                   goto skip;
  759.                 }
  760. +#endif
  761.                 break;
  762.  #endif
  763. -#endif
  764.  #ifdef OGG_MUSIC
  765.             case MUS_OGG:
  766.                
  767. @@ -306,6 +322,7 @@
  768.         }
  769.     }
  770.  
  771. +skip:
  772.     /* Handle seamless music looping */
  773.     if (left > 0 && left < len && music_halt_or_loop()) {
  774.         music_mixer(udata, stream+(len-left), left);
  775. @@ -341,9 +358,21 @@
  776.         timidity_ok = 0;
  777.     }
  778.  #endif
  779. +#ifdef USE_FLUIDSYNTH_MIDI
  780. +   if ( fluidsynth_init(mixer) == 0 ) {
  781. +       fluidsynth_ok = 1;
  782. +       add_music_decoder("FLUIDSYNTH");
  783. +   } else {
  784. +       fluidsynth_ok = 0;
  785. +   }
  786. +#endif
  787.  #ifdef USE_NATIVE_MIDI
  788. +#ifdef USE_FLUIDSYNTH_MIDI
  789. +   native_midi_ok = !fluidsynth_ok;
  790. +   if ( native_midi_ok )
  791. +#endif
  792.  #ifdef USE_TIMIDITY_MIDI
  793. -   native_midi_ok = !timidity_ok;
  794. +       native_midi_ok = !timidity_ok;
  795.     if ( !native_midi_ok ) {
  796.         native_midi_ok = (getenv("SDL_NATIVE_MUSIC") != NULL);
  797.     }
  798. @@ -469,7 +498,17 @@
  799.                 Mix_SetError("%s", native_midi_error());
  800.                 music->error = 1;
  801.             }
  802. -       } MIDI_ELSE
  803. +           goto skip;
  804. +       }
  805. +#endif
  806. +#ifdef USE_FLUIDSYNTH_MIDI
  807. +       if ( fluidsynth_ok ) {
  808. +           music->data.fluidsynthmidi = fluidsynth_loadsong(file);
  809. +           if ( music->data.fluidsynthmidi == NULL ) {
  810. +               music->error = 1;
  811. +           }
  812. +           goto skip;
  813. +       }
  814.  #endif
  815.  #ifdef USE_TIMIDITY_MIDI
  816.         if ( timidity_ok ) {
  817. @@ -565,6 +604,8 @@
  818.         Mix_SetError("Unrecognized music format");
  819.         music->error = 1;
  820.     }
  821. +
  822. +skip:
  823.     if ( music->error ) {
  824.         free(music);
  825.         music = NULL;
  826. @@ -616,11 +657,19 @@
  827.  #ifdef USE_NATIVE_MIDI
  828.                 if ( native_midi_ok ) {
  829.                     native_midi_freesong(music->data.nativemidi);
  830. -               } MIDI_ELSE
  831. +                   goto skip;
  832. +               }
  833. +#endif
  834. +#ifdef USE_FLUIDSYNTH_MIDI
  835. +               if ( fluidsynth_ok ) {
  836. +                   fluidsynth_freesong(music->data.fluidsynthmidi);
  837. +                   goto skip;
  838. +               }
  839.  #endif
  840.  #ifdef USE_TIMIDITY_MIDI
  841.                 if ( timidity_ok ) {
  842.                     Timidity_FreeSong(music->data.midi);
  843. +                   goto skip;
  844.                 }
  845.  #endif
  846.                 break;
  847. @@ -649,6 +698,8 @@
  848.                 /* Unknown music type?? */
  849.                 break;
  850.         }
  851. +
  852. +    skip:
  853.         free(music);
  854.     }
  855.  }
  856. @@ -720,11 +771,19 @@
  857.  #ifdef USE_NATIVE_MIDI
  858.         if ( native_midi_ok ) {
  859.             native_midi_start(music->data.nativemidi);
  860. -       } MIDI_ELSE
  861. +           goto skip;
  862. +       }
  863. +#endif
  864. +#ifdef USE_FLUIDSYNTH_MIDI
  865. +       if (fluidsynth_ok ) {
  866. +           fluidsynth_start(music->data.fluidsynthmidi);
  867. +           goto skip;
  868. +       }
  869.  #endif
  870.  #ifdef USE_TIMIDITY_MIDI
  871.         if ( timidity_ok ) {
  872.             Timidity_Start(music->data.midi);
  873. +           goto skip;
  874.         }
  875.  #endif
  876.         break;
  877. @@ -757,6 +816,7 @@
  878.         break;
  879.     }
  880.  
  881. +skip:
  882.     /* Set the playback position, note any errors if an offset is used */
  883.     if ( retval == 0 ) {
  884.         if ( position > 0.0 ) {
  885. @@ -929,11 +989,19 @@
  886.  #ifdef USE_NATIVE_MIDI
  887.         if ( native_midi_ok ) {
  888.             native_midi_setvolume(volume);
  889. -       } MIDI_ELSE
  890. +           return;
  891. +       }
  892. +#endif
  893. +#ifdef USE_FLUIDSYNTH_MIDI
  894. +       if ( fluidsynth_ok ) {
  895. +           fluidsynth_setvolume(music_playing->data.fluidsynthmidi, volume);
  896. +           return;
  897. +       }
  898.  #endif
  899.  #ifdef USE_TIMIDITY_MIDI
  900.         if ( timidity_ok ) {
  901.             Timidity_SetVolume(volume);
  902. +           return;
  903.         }
  904.  #endif
  905.         break;
  906. @@ -1012,11 +1080,19 @@
  907.  #ifdef USE_NATIVE_MIDI
  908.         if ( native_midi_ok ) {
  909.             native_midi_stop();
  910. -       } MIDI_ELSE
  911. +           goto skip;
  912. +       }
  913. +#endif
  914. +#ifdef USE_FLUIDSYNTH_MIDI
  915. +       if ( fluidsynth_ok ) {
  916. +           fluidsynth_stop(music_playing->data.fluidsynthmidi);
  917. +           goto skip;
  918. +       }
  919.  #endif
  920.  #ifdef USE_TIMIDITY_MIDI
  921.         if ( timidity_ok ) {
  922.             Timidity_Stop();
  923. +           goto skip;
  924.         }
  925.  #endif
  926.         break;
  927. @@ -1045,6 +1121,8 @@
  928.         /* Unknown music type?? */
  929.         return;
  930.     }
  931. +
  932. +skip:
  933.     music_playing->fading = MIX_NO_FADING;
  934.     music_playing = NULL;
  935.  }
  936. @@ -1173,12 +1251,21 @@
  937.         if ( native_midi_ok ) {
  938.             if ( ! native_midi_active() )
  939.                 playing = 0;
  940. -       } MIDI_ELSE
  941. +           goto skip;
  942. +       }
  943. +#endif
  944. +#ifdef USE_FLUIDSYNTH_MIDI
  945. +       if ( fluidsynth_ok ) {
  946. +           if ( ! fluidsynth_active(music_playing->data.fluidsynthmidi) )
  947. +               playing = 0;
  948. +           goto skip;
  949. +       }
  950.  #endif
  951.  #ifdef USE_TIMIDITY_MIDI
  952.         if ( timidity_ok ) {
  953.             if ( ! Timidity_Active() )
  954.                 playing = 0;
  955. +           goto skip;
  956.         }
  957.  #endif
  958.         break;
  959. @@ -1214,6 +1301,8 @@
  960.         playing = 0;
  961.         break;
  962.     }
  963. +
  964. +skip:
  965.     return(playing);
  966.  }
  967.  int Mix_PlayingMusic(void)
  968. @@ -1393,7 +1482,17 @@
  969.                 Mix_SetError("%s", native_midi_error());
  970.                 music->error = 1;
  971.             }
  972. -       } MIDI_ELSE
  973. +           goto skip;
  974. +       }
  975. +#endif
  976. +#ifdef USE_FLUIDSYNTH_MIDI
  977. +       if ( fluidsynth_ok ) {
  978. +           music->data.fluidsynthmidi = fluidsynth_loadsong_RW(rw);
  979. +           if ( music->data.fluidsynthmidi == NULL ) {
  980. +               music->error = 1;
  981. +           }
  982. +           goto skip;
  983. +       }
  984.  #endif
  985.  #ifdef USE_TIMIDITY_MIDI
  986.         if ( timidity_ok ) {
  987. @@ -1436,9 +1535,72 @@
  988.         Mix_SetError("Unrecognized music format");
  989.         music->error=1;
  990.     }
  991. +
  992. +skip:
  993.     if (music->error) {
  994.         free(music);
  995.         music=NULL;
  996.     }
  997.     return(music);
  998.  }
  999. +
  1000. +int Mix_SetSoundFonts(const char *paths)
  1001. +{
  1002. +#ifdef MID_MUSIC
  1003. +   if (soundfont_paths) {
  1004. +       free(soundfont_paths);
  1005. +       soundfont_paths = NULL;
  1006. +   }
  1007. +
  1008. +   if (paths) {
  1009. +       if (!(soundfont_paths = strdup(paths))) {
  1010. +           Mix_SetError("Insufficient memory to set SoundFonts");
  1011. +           return 0;
  1012. +       }
  1013. +   }
  1014. +#endif
  1015. +   return 1;
  1016. +}
  1017. +
  1018. +#ifdef MID_MUSIC
  1019. +const char* Mix_GetSoundFonts()
  1020. +{
  1021. +   const char* force = getenv("SDL_FORCE_SOUNDFONTS");
  1022. +
  1023. +   if (!soundfont_paths || (force && force[0] == '1')) {
  1024. +       return getenv("SDL_SOUNDFONTS");
  1025. +   } else {
  1026. +       return soundfont_paths;
  1027. +   }
  1028. +}
  1029. +
  1030. +int Mix_EachSoundFont(int (*function)(const char*, void*), void *data)
  1031. +{
  1032. +   char *context, *path, *paths;
  1033. +   const char* cpaths = Mix_GetSoundFonts();
  1034. +
  1035. +   if (!cpaths) {
  1036. +       Mix_SetError("No SoundFonts have been requested");
  1037. +       return 0;
  1038. +   }
  1039. +
  1040. +   if (!(paths = strdup(cpaths))) {
  1041. +       Mix_SetError("Insufficient memory to iterate over SoundFonts");
  1042. +       return 0;
  1043. +   }
  1044. +
  1045. +#ifdef _WIN32
  1046. +   for (path = strtok_s(paths, ";", &context); path; path = strtok_s(NULL, ";", &context)) {
  1047. +#else
  1048. +   for (path = strtok_r(paths, ":;", &context); path; path = strtok_r(NULL, ":;", &context)) {
  1049. +#endif
  1050. +       if (!function(path, data)) {
  1051. +           free(paths);
  1052. +           return 0;
  1053. +       }
  1054. +   }
  1055. +
  1056. +   free(paths);
  1057. +   return 1;
  1058. +}
  1059. +#endif
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!