Use better quality sounds than those of freepats
* Copy patch bug-715461-soundfont_paths.patch from sdl-mixer1.2 to use
better quality sounds than those of freepats. Thanks Fabian Greffrath
(Closes: #766019)
Manuel A. Fernandez Montecelo
9 years ago
|
0 |
libsdl2-mixer (2.0.0+dfsg1-4) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* Copy patch bug-715461-soundfont_paths.patch from sdl-mixer1.2 to use
|
|
3 |
better quality sounds than those of freepats. Thanks Fabian Greffrath
|
|
4 |
(Closes: #766019)
|
|
5 |
|
|
6 |
-- Manuel A. Fernandez Montecelo <mafm@debian.org> Sat, 25 Oct 2014 00:11:40 +0100
|
|
7 |
|
| 0 | 8 |
libsdl2-mixer (2.0.0+dfsg1-3) unstable; urgency=low
|
| 1 | 9 |
|
| 2 | 10 |
* Bump Policy Standards-Version to 3.9.5 (no changes needed)
|
| 24 | 24 |
Pre-Depends: ${misc:Pre-Depends}
|
| 25 | 25 |
Depends: ${shlibs:Depends},
|
| 26 | 26 |
${misc:Depends}
|
| 27 | |
Recommends: freepats
|
|
27 |
Recommends: musescore-soundfont-gm | fluid-soundfont-gm | freepats
|
| 28 | 28 |
Description: Mixer library for Simple DirectMedia Layer 2, libraries
|
| 29 | 29 |
SDL_mixer is a sample multi-channel audio mixer library. It supports any
|
| 30 | 30 |
number of simultaneously playing channels of 16 bit stereo audio, plus a single
|
|
0 |
Description: no sf2 sound fonts loaded by default
|
|
1 |
Introduced in 1.2.12-6 (Thu, 11 Jul 2013 12:17:15 +0100)
|
|
2 |
Author: Fabian Greffrath <fabian@greffrath.com>
|
|
3 |
Last-Update: 2013-10-09
|
|
4 |
Bug-Debian: http://bugs.debian.org/715461
|
|
5 |
--- a/mixer.c
|
|
6 |
+++ b/mixer.c
|
|
7 |
@@ -148,6 +148,11 @@
|
|
8 |
{
|
|
9 |
int result = 0;
|
|
10 |
|
|
11 |
+#ifdef MIX_INIT_SOUNDFONT_PATHS
|
|
12 |
+ if (!soundfont_paths)
|
|
13 |
+ soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS);
|
|
14 |
+#endif
|
|
15 |
+
|
|
16 |
if (flags & MIX_INIT_FLUIDSYNTH) {
|
|
17 |
#ifdef USE_FLUIDSYNTH_MIDI
|
|
18 |
if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
|
|
19 |
--- a/music.c
|
|
20 |
+++ b/music.c
|
|
21 |
@@ -1567,6 +1567,7 @@
|
|
22 |
{
|
|
23 |
char *context, *path, *paths;
|
|
24 |
const char* cpaths = Mix_GetSoundFonts();
|
|
25 |
+ int soundfonts_found = 0;
|
|
26 |
|
|
27 |
if (!cpaths) {
|
|
28 |
Mix_SetError("No SoundFonts have been requested");
|
|
29 |
@@ -1586,12 +1587,16 @@
|
|
30 |
for (path = strtok_r(paths, ":;", &context); path; path = strtok_r(NULL, ":;", &context)) {
|
|
31 |
#endif
|
|
32 |
if (!function(path, data)) {
|
|
33 |
- SDL_free(paths);
|
|
34 |
- return 0;
|
|
35 |
+ continue;
|
|
36 |
+ } else {
|
|
37 |
+ soundfonts_found++;
|
|
38 |
}
|
|
39 |
}
|
|
40 |
|
|
41 |
SDL_free(paths);
|
|
42 |
- return 1;
|
|
43 |
+ if (soundfonts_found > 0)
|
|
44 |
+ return 1;
|
|
45 |
+ else
|
|
46 |
+ return 0;
|
|
47 |
}
|
|
48 |
#endif
|
|
0 |
bug-715461-soundfont_paths.patch
|
| 5 | 5 |
MODPLUG_INCLUDE_DIR := -I/usr/include/libmodplug
|
| 6 | 6 |
|
| 7 | 7 |
export DEB_CFLAGS_MAINT_APPEND := -pipe -Wall $(MODPLUG_INCLUDE_DIR)
|
|
8 |
# bug #715461, provide default soundfont paths
|
|
9 |
export DEB_CPPFLAGS_MAINT_APPEND := -DMIX_INIT_SOUNDFONT_PATHS=\"/usr/share/sounds/sf2/TimGM6mb.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2\"
|
| 8 | 10 |
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
|
| 9 | 11 |
|
| 10 | 12 |
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
|