[SCM] calf/master: Unbreak fluidsynth after changing configure semantics.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:40:26 UTC 2013


The following commit has been merged in the master branch:
commit 0acd3c539f5b622433440d2e2c79af64531977df
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Oct 20 23:30:16 2010 +0100

    Unbreak fluidsynth after changing configure semantics.

diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp
index 451387c..bbb034f 100644
--- a/src/fluidsynth.cpp
+++ b/src/fluidsynth.cpp
@@ -160,16 +160,21 @@ char *fluidsynth_audio_module::configure(const char *key, const char *value)
 {
     if (!strcmp(key, "preset_key_set"))
     {
-        set_preset = atoi(value);
+        set_preset = value ? atoi(value) : 0;
         return NULL;
     }
     if (!strcmp(key, "soundfont"))
     {
-        if (*value)
+        if (value && *value)
+        {
             printf("Loading %s\n", value);
+            soundfont = value;
+        }
         else
+        {
             printf("Creating a blank synth\n");
-        soundfont = value;
+            soundfont.clear();
+        }
         int newsfid = -1;
         fluid_synth_t *new_synth = create_synth(newsfid);
         status_serial++;

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list