#include <vlc_common.h>
#include <vlc_plugin.h>
+#include <vlc_modules.h>
#include "screen.h"
/*****************************************************************************
#ifdef SCREEN_MOUSE
#define MOUSE_TEXT N_( "Mouse pointer image" )
#define MOUSE_LONGTEXT N_( \
- "If specifed, will use the image to draw the mouse pointer on the " \
+ "If specified, will use the image to draw the mouse pointer on the " \
"capture." )
#endif
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000,
CACHING_TEXT, CACHING_LONGTEXT, true )
- add_float( "screen-fps", SCREEN_FPS, 0, FPS_TEXT, FPS_LONGTEXT, true )
+ add_float( "screen-fps", SCREEN_FPS, FPS_TEXT, FPS_LONGTEXT, true )
#ifdef SCREEN_SUBSCREEN
- add_integer( "screen-top", 0, NULL, TOP_TEXT, TOP_LONGTEXT, true )
- add_integer( "screen-left", 0, NULL, LEFT_TEXT, LEFT_LONGTEXT, true )
- add_integer( "screen-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true )
- add_integer( "screen-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
+ add_integer( "screen-top", 0, TOP_TEXT, TOP_LONGTEXT, true )
+ add_integer( "screen-left", 0, LEFT_TEXT, LEFT_LONGTEXT, true )
+ add_integer( "screen-width", 0, WIDTH_TEXT, WIDTH_LONGTEXT, true )
+ add_integer( "screen-height", 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
add_bool( "screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
FOLLOW_MOUSE_LONGTEXT, true )
#endif
#ifdef SCREEN_MOUSE
- add_file( "screen-mouse-image", "", NULL, MOUSE_TEXT, MOUSE_LONGTEXT,
- true )
+ add_loadfile( "screen-mouse-image", "", MOUSE_TEXT, MOUSE_LONGTEXT,
+ true )
#endif
#ifdef WIN32
- add_integer( "screen-fragment-size", 0, NULL, FRAGS_TEXT,
+ add_integer( "screen-fragment-size", 0, FRAGS_TEXT,
FRAGS_LONGTEXT, true )
#endif
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "screen-caching" ) *1000;
+ *pi64 = var_GetInteger( p_demux, "screen-caching" ) *1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
{
demux_sys_t *p_sys = p_demux->p_sys;
if( !p_sys->dst.i_planes )
- vout_InitPicture( p_demux, &p_sys->dst,
- p_sys->fmt.video.i_chroma,
- p_sys->fmt.video.i_width,
- p_sys->fmt.video.i_height,
- p_sys->fmt.video.i_aspect );
+ picture_Setup( &p_sys->dst,
+ p_sys->fmt.video.i_chroma,
+ p_sys->fmt.video.i_width,
+ p_sys->fmt.video.i_height,
+ p_sys->fmt.video.i_sar_num,
+ p_sys->fmt.video.i_sar_den );
if( !p_sys->p_blend )
{
p_sys->p_blend = vlc_object_create( p_demux, sizeof(filter_t) );
if( !p_sys->p_blend->p_module )
{
msg_Err( p_demux, "Could not load video blending module" );
- vlc_object_detach( p_sys->p_blend );
vlc_object_release( p_sys->p_blend );
p_sys->p_blend = NULL;
}