Remove bug-715461-soundfont_paths.patch, applied upstream
Fabian Greffrath
6 years ago
| 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: 2014-10-24 | |
| 4 | Bug-Debian: http://bugs.debian.org/715461 | |
| 5 | --- a/mixer.c | |
| 6 | +++ b/mixer.c | |
| 7 | @@ -149,6 +149,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 | @@ -1579,6 +1579,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 | @@ -1598,12 +1599,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 |