The soundfont API functions are public and should always be available.
authorSam Lantinga <slouken@libsdl.org>
Sat, 14 Oct 2017 01:49:37 -0700
changeset 7661e215d1f9492
parent 765 fca02fccc6ab
child 767 4fc4dc4c60ad
The soundfont API functions are public and should always be available.

This fixes bugs 3071 and 3088
mixer.c
music.c
     1.1 --- a/mixer.c	Fri Oct 13 15:11:13 2017 -0400
     1.2 +++ b/mixer.c	Sat Oct 14 01:49:37 2017 -0700
     1.3 @@ -110,9 +110,7 @@
     1.4  static int num_decoders = 0;
     1.5  
     1.6  /* Semicolon-separated SoundFont paths */
     1.7 -#ifdef MID_MUSIC
     1.8  extern char* soundfont_paths;
     1.9 -#endif
    1.10  
    1.11  int Mix_GetNumChunkDecoders(void)
    1.12  {
    1.13 @@ -249,12 +247,10 @@
    1.14          Mix_QuitOgg();
    1.15      }
    1.16  #endif
    1.17 -#ifdef MID_MUSIC
    1.18      if (soundfont_paths) {
    1.19          SDL_free(soundfont_paths);
    1.20          soundfont_paths = NULL;
    1.21      }
    1.22 -#endif
    1.23      initialized = 0;
    1.24  }
    1.25  
     2.1 --- a/music.c	Fri Oct 13 15:11:13 2017 -0400
     2.2 +++ b/music.c	Sat Oct 14 01:49:37 2017 -0700
     2.3 @@ -151,9 +151,7 @@
     2.4  static int num_decoders = 0;
     2.5  
     2.6  /* Semicolon-separated SoundFont paths */
     2.7 -#ifdef MID_MUSIC
     2.8  char* soundfont_paths = NULL;
     2.9 -#endif
    2.10  
    2.11  int Mix_GetNumMusicDecoders(void)
    2.12  {
    2.13 @@ -1601,7 +1599,6 @@
    2.14  
    2.15  int Mix_SetSoundFonts(const char *paths)
    2.16  {
    2.17 -#ifdef MID_MUSIC
    2.18      if (soundfont_paths) {
    2.19          SDL_free(soundfont_paths);
    2.20          soundfont_paths = NULL;
    2.21 @@ -1613,11 +1610,9 @@
    2.22              return 0;
    2.23          }
    2.24      }
    2.25 -#endif
    2.26      return 1;
    2.27  }
    2.28  
    2.29 -#ifdef MID_MUSIC
    2.30  const char* Mix_GetSoundFonts(void)
    2.31  {
    2.32      const char* force = getenv("SDL_FORCE_SOUNDFONTS");
    2.33 @@ -1665,4 +1660,3 @@
    2.34      else
    2.35          return 0;
    2.36  }
    2.37 -#endif