# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#define SOUT_CFG_PREFIX "sout-display-"
vlc_module_begin();
- set_shortname( _("Display"));
- set_description( _("Display stream output") );
+ set_shortname( N_("Display"));
+ set_description( N_("Display stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "display" );
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();
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"audio", "video", "delay", NULL
};
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;
};
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;
}
}
- 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'",