Include vlc_plugin.h as needed

[vlc] / modules / stream_out / display.c

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 75082ace3b5052709baa37cfb18906b0c54984dc..542bbb3db58b6d2e6024c1b0e59812e921881be9 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
@@ -57,11 +58,11 @@ vlc_module_begin();
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_STREAM );
     add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
-              AUDIO_LONGTEXT, VLC_TRUE );
+              AUDIO_LONGTEXT, true );
     add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
-              VIDEO_LONGTEXT, VLC_TRUE );
+              VIDEO_LONGTEXT, true );
     add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
-                 DELAY_LONGTEXT, VLC_TRUE );
+                 DELAY_LONGTEXT, true );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -82,8 +83,8 @@ struct sout_stream_sys_t
     input_thread_t *p_input;
     unsigned        i_es;
 
-    vlc_bool_t     b_audio;
-    vlc_bool_t     b_video;
+    bool     b_audio;
+    bool     b_video;
 
     mtime_t        i_delay;
 };
@@ -96,13 +97,6 @@ static int Open( vlc_object_t *p_this )
     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
     sout_stream_sys_t *p_sys;
 
-    /* FIXME: this sucks big time (see #1312) */
-    if( var_CreateGetBool( p_stream, "sout-keep" ) )
-    {
-        msg_Err( p_stream, "cannot use #display sout with sout-keep option" );
-        return VLC_EGENERIC;
-    }
-
     p_sys = malloc( sizeof( sout_stream_sys_t ) );
     if( p_sys == NULL )
         return VLC_ENOMEM;
@@ -174,7 +168,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         }
     }
 
-    id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, VLC_TRUE );
+    id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, true );
     if( id->p_dec == NULL )
     {
         msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",