Re: [fluid-dev] Testing before release

[Rui Nuno Capela]

Hi Josh,

Josh Green wrote:
> I checked in a couple changes to FluidSynth CVS and think that it is
> really about time to make a release :)  Anyone who feels inspired to,
> please test and let me know if all is well.
> 
> Recent commit:
> 
> Fixed nasty bug recently introduced in ALSA audio driver that caused it
> to terminate after ALSA write errors, for example an underrun.
> 
> Now using an inline replacement for roundf to complete the contributed
> 16 bit dithering from Mihail Zenkov.
> 
> 
> The one remaining item for the next release is making sure that the
> windows build is working.
> 
> Note to Stephen Grant:
> I had a look over the bugs you submitted to me, but they don't seem to
> correspond to the current state of the DirectSound driver in CVS.  I'm a
> bit in the dark on this code though, so I'm sure I've overlooked
> something (I need to setup a build for windows for this).  The line:
> 
> static HWND fluid_wnd = NULL;
> 
> that was removed from fluid_dsound.c doesn't seem to be used in that
> source file, but is instead declared in fluid_dll.c and used there.
> 
> If you could let me know what changes need to be made to make things
> work right, that would be great :)
> 

I would like to take a change to push on a couple of patches, that I've
been using for quite some time on my local tree:

- fluidsynth-1.0.7a-fluid_rev.patch
  this simple one just makes the good old reverb level back into
business; qsynth has been missing this one a lot, as everyone stomps
with disappointment on the respective dial knob being stuck on a top
99-100 disgraced value.

- fluidsynth-1.0.7a-fluid_jack.patch
  this applies to the jack driver, mainly regarding port naming
convention on the multi-port case and auto-connection warning log
message being a bit more explicit and in the correct code-path.

Cheers.
-- 
rncbc aka Rui Nuno Capela
address@hidden

diff -dupr fluidsynth-1.0.7a.0/src/fluid_jack.c 
fluidsynth-1.0.7a.1/src/fluid_jack.c
--- fluidsynth-1.0.7a.0/src/fluid_jack.c        2006-02-19 07:09:26.000000000 
+0000
+++ fluidsynth-1.0.7a.1/src/fluid_jack.c        2006-02-21 22:59:24.000000000 
+0000
@@ -188,12 +188,12 @@ new_fluid_jack_audio_driver(fluid_settin
     FLUID_MEMSET(dev->output_ports, 0, 2 * dev->num_output_ports * 
sizeof(jack_port_t*));
 
     for (i = 0; i < dev->num_output_ports; i++) {
-      sprintf(name, "l_%02d", i);
+      sprintf(name, "l_%d", i);
       dev->output_ports[2 * i] = jack_port_register(dev->client, name, 
                                                   JACK_DEFAULT_AUDIO_TYPE, 
                                                   JackPortIsOutput, 0);
 
-      sprintf(name, "r_%02d", i);
+      sprintf(name, "r_%d", i);
       dev->output_ports[2 * i + 1] = jack_port_register(dev->client, name, 
                                                       JACK_DEFAULT_AUDIO_TYPE, 
                                                       JackPortIsOutput, 0);
@@ -216,12 +216,12 @@ new_fluid_jack_audio_driver(fluid_settin
     FLUID_MEMSET(dev->fx_ports, 0, 2 * dev->num_fx_ports * 
sizeof(jack_port_t*));
 
     for (i = 0; i < dev->num_fx_ports; i++) {
-      sprintf(name, "fxl_%02d", i);
+      sprintf(name, "fxl_%d", i);
       dev->fx_ports[2 * i] = jack_port_register(dev->client, name, 
                                                JACK_DEFAULT_AUDIO_TYPE, 
                                                JackPortIsOutput, 0);
 
-      sprintf(name, "fxr_%02d", i);
+      sprintf(name, "fxr_%d", i);
       dev->fx_ports[2 * i + 1] = jack_port_register(dev->client, name, 
                                                    JACK_DEFAULT_AUDIO_TYPE, 
                                                    JackPortIsOutput, 0);
@@ -352,7 +352,7 @@ new_fluid_jack_audio_driver2(fluid_setti
          }
          
          for (i = 0; i < dev->num_output_ports; i++) {
-                 sprintf(name, "out_%02d", i);
+                 sprintf(name, "out_%d", i);
                  dev->output_ports[i] = jack_port_register(dev->client, name, 
                                                            
JACK_DEFAULT_AUDIO_TYPE, 
                                                            JackPortIsOutput, 
0);
@@ -374,7 +374,7 @@ new_fluid_jack_audio_driver2(fluid_setti
          }
          
          for (i = 0; i < dev->num_input_ports; i++) {
-                 sprintf(name, "in_%02d", i);
+                 sprintf(name, "in_%d", i);
                  dev->input_ports[i] = jack_port_register(dev->client, name, 
                                                           
JACK_DEFAULT_AUDIO_TYPE, 
                                                           JackPortIsInput, 0);
@@ -419,7 +419,7 @@ new_fluid_jack_audio_driver2(fluid_setti
     
         free (jack_ports);     /* free the jack port array */
       } else {
-        FLUID_LOG(FLUID_WARN, "Could not connect to any physical jack ports; "
+                          FLUID_LOG(FLUID_WARN, "Could not connect to any 
physical jack input ports; "
                 "fluidsynth is unconnected");
       }
     }
@@ -442,13 +442,12 @@ new_fluid_jack_audio_driver2(fluid_setti
         }
 
         free (jack_ports); /* free the jack port array */
-
-      }
     } else {
-      FLUID_LOG(FLUID_WARN, "Could not connect to any physical jack ports; "
+                          FLUID_LOG(FLUID_WARN, "Could not connect to any 
physical jack output ports; "
               "fluidsynth is unconnected");
     }
   }
+  }
 
   return (fluid_audio_driver_t*) dev;
 

diff -dupr fluidsynth-1.0.7a.0/src/fluid_rev.c 
fluidsynth-1.0.7a.1/src/fluid_rev.c
--- fluidsynth-1.0.7a.0/src/fluid_rev.c 2004-03-29 11:05:18.000000000 +0100
+++ fluidsynth-1.0.7a.1/src/fluid_rev.c 2006-02-21 23:01:12.000000000 +0000
@@ -535,8 +535,8 @@ void 
 fluid_revmodel_setlevel(fluid_revmodel_t* rev, fluid_real_t value)
 {
 /*   fluid_clip(value, 0.0f, 1.0f); */
-/*   rev->wet = value * scalewet; */
-/*   fluid_revmodel_update(rev); */
+  rev->wet = value * scalewet;
+  fluid_revmodel_update(rev);
 }
 
 fluid_real_t