Simplify FLAC extradata (streaminfo) parsing

[vlc] / modules / codec / fluidsynth.c

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 5f605e674f21f01b8d7c8e3d1b275be8a42bc7d7..49d5ab146065198b3d1ab8fee992c5f4f1980076 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -4,19 +4,19 @@
  * Copyright © 2007 Rémi Denis-Courmont
  * $Id$
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,6 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_dialog.h>
-#include <vlc_charset.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
@@ -37,7 +36,7 @@
 #endif
 
 /* On Win32, we link statically */
-#ifdef WIN32
+#ifdef _WIN32
 # define FLUIDSYNTH_NOT_A_DLL
 #endif
 
@@ -47,6 +46,8 @@
 #define SOUNDFONT_LONGTEXT N_( \
     "A sound fonts file is required for software synthesis." )
 
+#define CHORUS_TEXT N_("Chorus")
+
 #define GAIN_TEXT N_("Synthesis gain")
 #define GAIN_LONGTEXT N_("This gain is applied to synthesis output. " \
     "High values may cause saturation when many notes are played at a time." )
@@ -56,6 +57,8 @@
     "The polyphony defines how many voices can be played at a time. " \
     "Larger values require more processing power.")
 
+#define REVERB_TEXT N_("Reverb")
+
 #define SAMPLE_RATE_TEXT N_("Sample rate")
 
 static int  Open  (vlc_object_t *);
@@ -70,11 +73,13 @@ vlc_module_begin ()
     set_callbacks (Open, Close)
     add_loadfile ("soundfont", "",
                   SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false)
-    add_float ("synth-gain", 0.8, GAIN_TEXT, GAIN_LONGTEXT, false)
+    add_bool ("synth-chorus", true, CHORUS_TEXT, CHORUS_TEXT, false)
+    add_float ("synth-gain", .5, GAIN_TEXT, GAIN_LONGTEXT, false)
         change_float_range (0., 10.)
     add_integer ("synth-polyphony", 256,
                  POLYPHONY_TEXT, POLYPHONY_LONGTEXT, false)
         change_integer_range (1, 65535)
+    add_bool ("synth-reverb", true, REVERB_TEXT, REVERB_TEXT, true)
     add_integer ("synth-sample-rate", 44100,
                  SAMPLE_RATE_TEXT, SAMPLE_RATE_TEXT, true)
         change_integer_range (22050, 96000)
@@ -90,7 +95,7 @@ struct decoder_sys_t
 };
 
 
-static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block);
+static block_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block);
 
 
 static int Open (vlc_object_t *p_this)
@@ -111,11 +116,8 @@ static int Open (vlc_object_t *p_this)
     char *font_path = var_InheritString (p_this, "soundfont");
     if (font_path != NULL)
     {
-        const char *lpath = ToLocale (font_path);
-
         msg_Dbg (p_this, "loading sound fonts file %s", font_path);
         p_sys->soundfont = fluid_synth_sfload (p_sys->synth, font_path, 1);
-        LocaleFree (lpath);
         if (p_sys->soundfont == -1)
             msg_Err (p_this, "cannot load sound fonts file %s", font_path);
         free (font_path);
@@ -154,10 +156,14 @@ static int Open (vlc_object_t *p_this)
         return VLC_EGENERIC;
     }
 
+    fluid_synth_set_chorus_on (p_sys->synth,
+                               var_InheritBool (p_this, "synth-chorus"));
     fluid_synth_set_gain (p_sys->synth,
                           var_InheritFloat (p_this, "synth-gain"));
     fluid_synth_set_polyphony (p_sys->synth,
                                var_InheritInteger (p_this, "synth-polyphony"));
+    fluid_synth_set_reverb_on (p_sys->synth,
+                               var_InheritBool (p_this, "synth-reverb"));
 
     p_dec->fmt_out.i_cat = AUDIO_ES;
     p_dec->fmt_out.audio.i_rate =
@@ -189,11 +195,11 @@ static void Close (vlc_object_t *p_this)
 }
 
 
-static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
+static block_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
 {
     block_t *p_block;
     decoder_sys_t *p_sys = p_dec->p_sys;
-    aout_buffer_t *p_out = NULL;
+    block_t *p_out = NULL;
 
     if (pp_block == NULL)
         return NULL;