Cosmetics.

[vlc] / modules / codec / fluidsynth.c

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 22ef5bf79966dc137e35507f641b4e0496179fd4..8590de93a88541e9e740463b2224320e625e1a04 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -27,6 +27,7 @@
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>
+#include <vlc_cpu.h>
 
 /* On Win32, we link statically */
 #ifdef WIN32
@@ -108,7 +109,7 @@ 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;
-    if (vlc_CPU () & CPU_CAPABILITY_FPU)
+    if (HAVE_FPU)
     {
         p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
         p_dec->fmt_out.audio.i_bitspersample = 32;
@@ -196,8 +197,9 @@ static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
     if (p_out == NULL)
         goto drop;
 
-    p_out->start_date = date_Get (&p_sys->end_date );
-    p_out->end_date   = date_Increment (&p_sys->end_date, samples);
+    p_out->i_pts = date_Get (&p_sys->end_date );
+    p_out->i_length = date_Increment (&p_sys->end_date, samples)
+                      - p_out->i_pts;
     if (!p_sys->fixed)
         fluid_synth_write_float (p_sys->synth, samples,
                                  p_out->p_buffer, 0, 2,