Merge branch '2.0.x' into master

src/bindings/fluid_cmd.c

@@ -102,7 +102,7 @@ static const fluid_cmd_t fluid_commands[] =
     },
     {
         "pitch_bend_range", "event", fluid_handle_pitch_bend_range,
-        "pitch_bend chan range      Sets bend pitch range"
+        "pitch_bend_range chn range Sets pitch bend range for the given midi channel"
     },
     {
         "cc", "event", fluid_handle_cc,

src/drivers/fluid_alsa.c

@@ -355,6 +355,7 @@ void delete_fluid_alsa_audio_driver(fluid_audio_driver_t *p)
     if(dev->thread)
     {
         fluid_thread_join(dev->thread);
+        delete_fluid_thread(dev->thread);
     }
 
     if(dev->pcm)
@@ -757,6 +758,7 @@ delete_fluid_alsa_rawmidi_driver(fluid_midi_driver_t *p)
     if(dev->thread)
     {
         fluid_thread_join(dev->thread);
+        delete_fluid_thread(dev->thread);
     }
 
     if(dev->rawmidi_in)
@@ -1210,6 +1212,7 @@ delete_fluid_alsa_seq_driver(fluid_midi_driver_t *p)
     if(dev->thread)
     {
         fluid_thread_join(dev->thread);
+        delete_fluid_thread(dev->thread);
     }
 
     if(dev->seq_handle)

src/drivers/fluid_oss.c

@@ -448,6 +448,7 @@ delete_fluid_oss_audio_driver(fluid_audio_driver_t *p)
     if(dev->thread)
     {
         fluid_thread_join(dev->thread);
+        delete_fluid_thread(dev->thread);
     }
 
     if(dev->dspfd >= 0)
@@ -705,6 +706,7 @@ delete_fluid_oss_midi_driver(fluid_midi_driver_t *p)
     if(dev->thread)
     {
         fluid_thread_join(dev->thread);
+        delete_fluid_thread(dev->thread);
     }
 
     if(dev->fd >= 0)

src/drivers/fluid_pulse.c

@@ -221,6 +221,7 @@ void delete_fluid_pulse_audio_driver(fluid_audio_driver_t *p)
     if(dev->thread)
     {
         fluid_thread_join(dev->thread);
+        delete_fluid_thread(dev->thread);
     }
 
     if(dev->pa_handle)

src/midi/fluid_midi.c

@@ -1676,7 +1676,7 @@ new_fluid_player(fluid_synth_t *synth)
     player->currentfile = NULL;
     player->division = 0;
     player->send_program_change = 1;
-    player->miditempo = 480000;
+    player->miditempo = 500000;
     player->deltatime = 4.0;
     player->cur_msec = 0;
     player->cur_ticks = 0;
@@ -1760,7 +1760,7 @@ fluid_player_reset(fluid_player_t *player)
     player->ntracks = 0;
     player->division = 0;
     player->send_program_change = 1;
-    player->miditempo = 480000;
+    player->miditempo = 500000;
     player->deltatime = 4.0;
     return 0;
 }

src/utils/fluid_sys.c

@@ -933,7 +933,7 @@ fluid_thread_t *
 new_fluid_thread(const char *name, fluid_thread_func_t func, void *data, int prio_level, int detach)
 {
     GThread *thread;
-    fluid_thread_info_t *info;
+    fluid_thread_info_t *info = NULL;
     GError *err = NULL;
 
     g_return_val_if_fail(func != NULL, NULL);
@@ -970,25 +970,21 @@ new_fluid_thread(const char *name, fluid_thread_func_t func, void *data, int pri
 #endif
     }
 
+    else
+    {
 #if NEW_GLIB_THREAD_API
-    else
-    {
         thread = g_thread_try_new(name, (GThreadFunc)func, data, &err);
-    }
-
 #else
-    else
-    {
         thread = g_thread_create((GThreadFunc)func, data, detach == FALSE, &err);
-    }
-
 #endif
+    }
 
     if(!thread)
     {
         FLUID_LOG(FLUID_ERR, "Failed to create the thread: %s",
                   fluid_gerror_message(err));
         g_clear_error(&err);
+        FLUID_FREE(info);
         return NULL;
     }
 

src/utils/fluid_sys.h

@@ -19,7 +19,7 @@
  */
 
 
-/**
+/*
  * @file fluid_sys.h
  *
  * This header contains a bunch of (mostly) system and machine

src/utils/fluidsynth_priv.h

@@ -18,7 +18,7 @@
  * 02110-1301, USA
  */
 
-/**
+/*
  * @file fluidsynth_priv.h
  * 
  * lightweight part of fluid_sys.h, containing forward declarations of fluidsynth's private types and private macros