fluidsynth.c
changeset 542 3de4970b36d4
parent 532 b8e8ae4852b2
child 545 32e5ed415a34
     1.1 --- a/fluidsynth.c	Tue Jan 03 16:46:05 2012 -0800
     1.2 +++ b/fluidsynth.c	Wed Jan 04 00:16:03 2012 -0500
     1.3 @@ -66,7 +66,7 @@
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 -FluidSynthMidiSong *fluidsynth_loadsong_common(int (*function)(FluidSynthMidiSong*, void*), void *data)
     1.8 +static FluidSynthMidiSong *fluidsynth_loadsong_common(int (*function)(FluidSynthMidiSong*, void*), void *data)
     1.9  {
    1.10  	FluidSynthMidiSong *song;
    1.11  	fluid_settings_t *settings = NULL;
    1.12 @@ -105,19 +105,7 @@
    1.13  	return NULL;
    1.14  }
    1.15  
    1.16 -int fluidsynth_loadsong_internal(FluidSynthMidiSong *song, void *data)
    1.17 -{
    1.18 -	const char* path = (const char*) data;
    1.19 -
    1.20 -	if (fluidsynth.fluid_player_add(song->player, path) == FLUID_OK) {
    1.21 -		return 1;
    1.22 -	} else {
    1.23 -		Mix_SetError("FluidSynth failed to load %s", path);
    1.24 -		return 0;
    1.25 -	}
    1.26 -}
    1.27 -
    1.28 -int fluidsynth_loadsong_RW_internal(FluidSynthMidiSong *song, void *data)
    1.29 +static int fluidsynth_loadsong_RW_internal(FluidSynthMidiSong *song, void *data)
    1.30  {
    1.31  	off_t offset;
    1.32  	size_t size;
    1.33 @@ -146,11 +134,6 @@
    1.34  	return 0;
    1.35  }
    1.36  
    1.37 -FluidSynthMidiSong *fluidsynth_loadsong(const char *midifile)
    1.38 -{
    1.39 -	return fluidsynth_loadsong_common(fluidsynth_loadsong_internal, (void*) midifile);
    1.40 -}
    1.41 -
    1.42  FluidSynthMidiSong *fluidsynth_loadsong_RW(SDL_RWops *rw, int freerw)
    1.43  {
    1.44  	FluidSynthMidiSong *song;