Made vout_display_opengl_t private.

[vlc] / modules / codec / fluidsynth.c

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 0f25c89818dba34aa3c5dec5d305380d1d688b56..79ed0da3b30ecf05530cced6b69e284f1e72f6a9 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -40,6 +40,7 @@
 
 #if (FLUIDSYNTH_VERSION_MAJOR < 1) \
  || (FLUIDSYNTH_VERSION_MAJOR == 1 && FLUIDSYNTH_VERSION_MINOR < 1)
+# define FLUID_FAILED (-1)
 # define fluid_synth_sysex(synth, ptr, len, d, e, f, g) (FLUID_FAILED)
 # define fluid_synth_system_reset(synth) (FLUID_FAILED)
 # define fluid_synth_channel_pressure(synth, channel, p) (FLUID_FAILED)
@@ -59,8 +60,8 @@ vlc_module_begin ()
     set_category (CAT_INPUT)
     set_subcategory (SUBCAT_INPUT_ACODEC)
     set_callbacks (Open, Close)
-    add_file ("soundfont", "", NULL,
-              SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false);
+    add_loadfile ("soundfont", "",
+                  SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false);
 vlc_module_end ()
 
 
@@ -92,7 +93,8 @@ static int Open (vlc_object_t *p_this)
         dialog_Fatal (p_this, _("MIDI synthesis not set up"),
             _("A sound font file (.SF2) is required for MIDI synthesis.\n"
               "Please install a sound font and configure it "
-              "from the VLC preferences (Codecs / Audio / FluidSynth).\n"));
+              "from the VLC preferences "
+              "(Input / Codecs > Audio codecs > FluidSynth).\n"));
         return VLC_EGENERIC;
     }
 
@@ -237,7 +239,7 @@ static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
     unsigned samples =
         (p_block->i_pts - date_Get (&p_sys->end_date)) * 441 / 10000;
     if (samples == 0)
-        return NULL;
+        goto drop;
 
     p_out = decoder_NewAudioBuffer (p_dec, samples);
     if (p_out == NULL)