Merge commit 'origin/1.0-bugfix'

[vlc] / modules / codec / fluidsynth.c

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index ddf6d7d1e8925632edc078622ec1c9bded8eee9f..74c44fa3ee7c54d5f42ae110ff546d2139636261 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -23,7 +23,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>
 
@@ -36,15 +37,16 @@
 static int  Open  (vlc_object_t *);
 static void Close (vlc_object_t *);
 
-vlc_module_begin();
-    set_description (_("FluidSynth MIDI synthetizer"));
-    set_capability ("decoder", 100);
-    set_category (CAT_INPUT);
-    set_subcategory (SUBCAT_INPUT_ACODEC);
-    set_callbacks (Open, Close);
+vlc_module_begin ()
+    set_description (N_("FluidSynth MIDI synthetizer"))
+    set_capability ("decoder", 100)
+    set_shortname (N_("FluidSynth"))
+    set_category (CAT_INPUT)
+    set_subcategory (SUBCAT_INPUT_ACODEC)
+    set_callbacks (Open, Close)
     add_file ("soundfont", "", NULL,
-              SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, VLC_FALSE);
-vlc_module_end();
+              SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false);
+vlc_module_end ()
 
 
 struct decoder_sys_t
@@ -64,7 +66,7 @@ static int Open (vlc_object_t *p_this)
     decoder_t *p_dec = (decoder_t *)p_this;
     decoder_sys_t *p_sys;
 
-    if (p_dec->fmt_in.i_codec != VLC_FOURCC ('M', 'I', 'D', 'I'))
+    if (p_dec->fmt_in.i_codec != VLC_CODEC_MIDI)
         return VLC_EGENERIC;
 
     char *font_path = var_CreateGetNonEmptyString (p_this, "soundfont");
@@ -80,8 +82,8 @@ static int Open (vlc_object_t *p_this)
     p_dec->fmt_out.audio.i_original_channels =
     p_dec->fmt_out.audio.i_physical_channels =
         AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
-    p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
-    p_dec->fmt_out.audio.i_bitspersample = 16;
+    p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
+    p_dec->fmt_out.audio.i_bitspersample = 32;
 
     p_dec->pf_decode_audio = DecodeBlock;
     p_sys = p_dec->p_sys = malloc (sizeof (*p_sys));
@@ -126,12 +128,14 @@ static aout_buffer_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;
 
     if (pp_block == NULL)
         return NULL;
     p_block = *pp_block;
     if (p_block == NULL)
         return NULL;
+    *pp_block = NULL;
 
     if (p_block->i_pts && !aout_DateGet (&p_sys->end_date))
         aout_DateSet (&p_sys->end_date, p_block->i_pts);
@@ -139,12 +143,11 @@ static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
     if (p_block->i_pts < aout_DateGet (&p_sys->end_date))
     {
         msg_Warn (p_dec, "MIDI message in the past?");
-        block_Release (p_block);
-        return NULL;
+        goto drop;
     }
 
     if (p_block->i_buffer < 1)
-        return NULL;
+        goto drop;
 
     uint8_t channel = p_block->p_buffer[0] & 0xf;
     uint8_t p1 = (p_block->i_buffer > 1) ? (p_block->p_buffer[1] & 0x7f) : 0;
@@ -168,25 +171,22 @@ static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
             fluid_synth_pitch_bend (p_sys->synth, channel, (p1 << 7) | p2);
             break;
     }
-    p_block->p_buffer += p_block->i_buffer;
-    p_block->i_buffer = 0;
 
     unsigned samples =
         (p_block->i_pts - aout_DateGet (&p_sys->end_date)) * 441 / 10000;
     if (samples == 0)
         return NULL;
 
-    aout_buffer_t *p_out = p_dec->pf_aout_buffer_new (p_dec, samples);
+    p_out = decoder_NewAudioBuffer (p_dec, samples);
     if (p_out == NULL)
-    {
-        block_Release (p_block);
-        return NULL;
-    }
+        goto drop;
 
     p_out->start_date = aout_DateGet (&p_sys->end_date );
     p_out->end_date   = aout_DateIncrement (&p_sys->end_date, samples);
-    fluid_synth_write_s16 (p_sys->synth, samples,
-                           (int16_t *)p_out->p_buffer, 0, 2,
-                           (int16_t *)p_out->p_buffer, 1, 2);
+    fluid_synth_write_float (p_sys->synth, samples,
+                             p_out->p_buffer, 0, 2,
+                             p_out->p_buffer, 1, 2);
+drop:
+    block_Release (p_block);
     return p_out;
 }