1 files changed, 31 insertions, 25 deletions

diff --git a/src/modules/fluidsynth.c b/src/modules/fluidsynth.c
index 9eedc2c..eeaa795 100644
--- a/src/modules/fluidsynth.c
+++ b/src/modules/fluidsynth.c
@@ -4,54 +4,60 @@
 
 #include <fluidsynth.h>
 
-struct fluidsynth_userdata {
+static struct fluidsynth_userdata {
 	fluid_settings_t *settings;
 	fluid_synth_t *synth;
-	fluid_player_t *player;
 	int soundfont;
-};
+} *fs;
 
 
 static void fluidsynth_callback(void *userdata, unsigned char *stream, int const length) {
-	struct fluidsynth_userdata *fs = userdata;
+	//fluid_player_t *player = userdata;
+	(void) userdata;
 	fluid_synth_write_float(fs->synth, length / sizeof (float) / 2, stream, 0, 2, stream, 1, 2);
 }
 
 static void fluidsynth_free(void *ptr) {
-	struct fluidsynth_userdata *fs = ptr;
-	fluid_player_stop(fs->player);
-	delete_fluid_player(fs->player);
-	fluid_player_play(fs->player);
+	fluid_player_t *player = ptr;
+	fluid_player_stop(player);
+	delete_fluid_player(player);
+	//fluid_synth_all_notes_off(fs->synth, -1);
+	fluid_synth_system_reset(fs->synth);
+	#if 0
 	fluid_synth_sfunload(fs->synth, fs->soundfont, 0);
 	delete_fluid_synth(fs->synth);
 	delete_fluid_settings(fs->settings);
 	free(fs);
+	#endif
 }
 
 int module_fluidsynth(struct blob *file, struct userdata *userdata) {
-	struct fluidsynth_userdata *fs = malloc(sizeof (struct fluidsynth_userdata));
 	if (fs == NULL) {
-		return 1;
-	}
-	fs->settings = new_fluid_settings(); // wasteful, but when trying to 'fix' it it just caused more errors
-	fluid_settings_setnum(fs->settings, "synth.gain", 0.5);
-	fluid_settings_setint(fs->settings, "player.reset-synth", 0);
-	fluid_settings_setnum(fs->settings, "synth.sample-rate", SAMPLE_RATE);
-	fs->synth = new_fluid_synth(fs->settings);
-	char *soundfont_path = getenv("SOUNDFONT");
-	if (soundfont_path == NULL) {
-		soundfont_path = "/usr/share/sounds/sf2/default-GM.sf2";
+		fs = malloc(sizeof (struct fluidsynth_userdata));
+		if (fs == NULL) {
+			return 1;
+		}
+		fs->settings = new_fluid_settings(); // wasteful, but when trying to 'fix' it it just caused more errors
+		fluid_settings_setnum(fs->settings, "synth.gain", 0.5);
+		fluid_settings_setint(fs->settings, "player.reset-synth", 0);
+		fluid_settings_setnum(fs->settings, "synth.sample-rate", SAMPLE_RATE);
+		fs->synth = new_fluid_synth(fs->settings);
+		char *soundfont_path = getenv("SOUNDFONT");
+		if (soundfont_path == NULL) {
+			soundfont_path = "/usr/share/sounds/sf2/default-GM.sf2";
+		}
+		fs->soundfont = fluid_synth_sfload(fs->synth, soundfont_path, 1); // ugly hack
 	}
-	fs->soundfont = fluid_synth_sfload(fs->synth, soundfont_path, 1); // ugly hack
-	fs->player = new_fluid_player(fs->synth);
-	fluid_player_set_loop(fs->player, -1);
-	if (fluid_player_add_mem(fs->player, file->data, file->size) == FLUID_FAILED) {
+	fluid_player_t *player = new_fluid_player(fs->synth);
+	fluid_player_set_loop(player, -1);
+	if (fluid_player_add_mem(player, file->data, file->size) == FLUID_FAILED) {
 		fluidsynth_free(fs);
+		fs = NULL;
 		return 1;
 	}
-	fluid_player_play(fs->player);
+	fluid_player_play(player);
 	userdata->callback = fluidsynth_callback;
-	userdata->user = fs;
+	userdata->user = player;
 	userdata->freefunc = fluidsynth_free;
 	return 0;
 }