#include <stdio.h>
#include <stdlib.h> /* free() */
#include <sys/types.h> /* opendir() */
-#include <sys/stat.h>
#include <dirent.h> /* opendir() */
#include <assert.h>
#include <time.h> /* strftime */
#include <vlc_vout.h>
#include <vlc_image.h>
#include <vlc_osd.h>
-#include <vlc_charset.h>
-
#include <vlc_strings.h>
#include <vlc_charset.h>
#include "../libvlc.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void InitWindowSize( vout_thread_t *, unsigned *, unsigned * );
-
/* Object variables callbacks */
static int ZoomCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
{ "16:9", "16:9" },
{ "16:10", "16:10" },
{ "221:100", "2.21:1" },
+ { "235:100", "2.35:1" },
+ { "239:100", "2.39:1" },
{ "5:4", "5:4" },
{ NULL, NULL } };
static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var,
char *psz_list )
{
- if( psz_list && *psz_list )
+ assert( psz_list );
+
+ char *psz_cur = psz_list;
+ char *psz_next;
+ while( psz_cur && *psz_cur )
{
- char *psz_cur = psz_list;
- char *psz_next;
- while( psz_cur && *psz_cur )
+ vlc_value_t val, text;
+ psz_next = strchr( psz_cur, ',' );
+ if( psz_next )
{
- vlc_value_t val, text;
- psz_next = strchr( psz_cur, ',' );
- if( psz_next )
- {
- *psz_next = '\0';
- psz_next++;
- }
- val.psz_string = psz_cur;
- text.psz_string = psz_cur;
- var_Change( p_vout, psz_var, VLC_VAR_ADDCHOICE, &val, &text);
- psz_cur = psz_next;
+ *psz_next = '\0';
+ psz_next++;
}
+ val.psz_string = psz_cur;
+ text.psz_string = psz_cur;
+ var_Change( p_vout, psz_var, VLC_VAR_ADDCHOICE, &val, &text);
+ psz_cur = psz_next;
}
}
var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- p_vout->i_alignment = var_CreateGetInteger( p_vout, "align" );
+ var_Create( p_vout, "align", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "mouse-hide-timeout",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- p_vout->p->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
- p_vout->p->i_title_timeout =
- (mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
- p_vout->p->i_title_position =
- var_CreateGetInteger( p_vout, "video-title-position" );
- p_vout->p->psz_title = NULL;
-
+ p_vout->p->title.show = var_CreateGetBool( p_vout, "video-title-show" );
+ p_vout->p->title.timeout = var_CreateGetInteger( p_vout,
+ "video-title-timeout" );
+ p_vout->p->title.position = var_CreateGetInteger( p_vout,
+ "video-title-position" );
var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL );
var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL );
var_AddCallback( p_vout, "video-title-position", TitlePositionCallback, NULL );
var_Create( p_vout, "crop-update", VLC_VAR_VOID );
/* Add custom crop ratios */
- psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" );
- AddCustomRatios( p_vout, "crop", psz_buf );
- free( psz_buf );
+ psz_buf = var_CreateGetNonEmptyString( p_vout, "custom-crop-ratios" );
+ if( psz_buf )
+ {
+ AddCustomRatios( p_vout, "crop", psz_buf );
+ free( psz_buf );
+ }
var_AddCallback( p_vout, "crop", CropCallback, NULL );
var_Get( p_vout, "crop", &old_val );
}
else
{
- i_aspect = atof( val.psz_string );
+ i_aspect = us_atof( val.psz_string );
vlc_ureduce( &i_aspect_num, &i_aspect_den,
i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 );
}
}
/* Add custom aspect ratios */
- psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" );
- AddCustomRatios( p_vout, "aspect-ratio", psz_buf );
- free( psz_buf );
+ psz_buf = var_CreateGetNonEmptyString( p_vout, "custom-aspect-ratios" );
+ if( psz_buf )
+ {
+ AddCustomRatios( p_vout, "aspect-ratio", psz_buf );
+ free( psz_buf );
+ }
var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
var_Get( p_vout, "aspect-ratio", &old_val );
text.psz_string = _("Autoscale video");
var_Change( p_vout, "autoscale", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "autoscale", ScalingCallback, NULL );
- p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" );
var_Create( p_vout, "scale", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT
| VLC_VAR_ISCOMMAND );
text.psz_string = _("Scale factor");
var_Change( p_vout, "scale", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "scale", ScalingCallback, NULL );
- p_vout->i_zoom = (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
-
- /* Initialize the dimensions of the video window */
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
/* Add a variable to indicate if the window should be on top of others */
var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
text.psz_string = _("Always on top");
var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL );
+ var_TriggerCallback( p_vout, "video-on-top" );
/* Add a variable to indicate whether we want window decoration or not */
var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* Add a fullscreen variable */
- if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) )
- {
- /* user requested fullscreen */
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- }
+ var_Create( p_vout, "fullscreen",
+ VLC_VAR_BOOL | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
text.psz_string = _("Fullscreen");
var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );
var_AddCallback( p_vout, "video-snapshot", SnapshotCallback, NULL );
/* Mouse coordinates */
- var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
- var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
-
- var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
- var_SetBool( p_vout, "intf-change", true );
+ var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS );
+ var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
+ var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
}
/*****************************************************************************
p_subpic->i_original_picture_width *= 4;
p_subpic->i_original_picture_height *= 4;
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
- return VLC_SUCCESS;
-}
-/**
- * This function will return the default directory used for snapshots
- */
-static char *VoutSnapshotGetDefaultDirectory( void )
-{
- char *psz_path = NULL;
-#if defined(__APPLE__) || defined(SYS_BEOS)
-
- if( asprintf( &psz_path, "%s/Desktop",
- config_GetHomeDir() ) == -1 )
- psz_path = NULL;
-
-#elif defined(WIN32) && !defined(UNDER_CE)
-
- /* Get the My Pictures folder path */
- char *p_mypicturesdir = NULL;
- typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD,
- LPWSTR );
- #ifndef CSIDL_FLAG_CREATE
- # define CSIDL_FLAG_CREATE 0x8000
- #endif
- #ifndef CSIDL_MYPICTURES
- # define CSIDL_MYPICTURES 0x27
- #endif
- #ifndef SHGFP_TYPE_CURRENT
- # define SHGFP_TYPE_CURRENT 0
- #endif
-
- HINSTANCE shfolder_dll;
- SHGETFOLDERPATH SHGetFolderPath ;
-
- /* load the shfolder dll to retrieve SHGetFolderPath */
- if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL )
- {
- wchar_t wdir[PATH_MAX];
- SHGetFolderPath = (void *)GetProcAddress( shfolder_dll,
- _T("SHGetFolderPathW") );
- if ((SHGetFolderPath != NULL )
- && SUCCEEDED (SHGetFolderPath (NULL,
- CSIDL_MYPICTURES | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT,
- wdir)))
- p_mypicturesdir = FromWide (wdir);
-
- FreeLibrary( shfolder_dll );
- }
-
- if( p_mypicturesdir == NULL )
- psz_path = strdup( config_GetHomeDir() );
- else
- psz_path = p_mypicturesdir;
-
-#else
-
- /* XXX: This saves in the data directory. Shouldn't we try saving
- * to psz_homedir/Desktop or something nicer ? */
- psz_path = config_GetUserDataDir();
-
-#endif
-
- return psz_path;
-}
-/**
- * This function will save a video snapshot to a file
- */
-static int VoutWriteSnapshot( vout_thread_t *p_vout, char **ppsz_filename,
- const block_t *p_image,
- const char *psz_path,
- const char *psz_format,
- const char *psz_prefix_fmt )
-{
- /* */
- char *psz_filename;
- DIR *p_path = utf8_opendir( psz_path );
- if( p_path != NULL )
- {
- /* The use specified a directory path */
- closedir( p_path );
-
- /* */
- char *psz_prefix = NULL;
- if( psz_prefix_fmt )
- psz_prefix = str_format( p_vout, psz_prefix_fmt );
- if( !psz_prefix )
- {
- psz_prefix = strdup( "vlcsnap-" );
- if( !psz_prefix )
- goto error;
- }
-
- if( var_GetBool( p_vout, "snapshot-sequential" ) )
- {
- int i_num = var_GetInteger( p_vout, "snapshot-num" );
- for( ; ; i_num++ )
- {
- struct stat st;
-
- if( asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s",
- psz_path, psz_prefix, i_num++, psz_format ) < 0 )
- {
- free( psz_prefix );
- goto error;
- }
- if( utf8_stat( psz_filename, &st ) )
- break;
- free( psz_filename );
- }
-
- var_SetInteger( p_vout, "snapshot-num", i_num );
- }
- else
- {
- struct tm curtime;
- time_t lcurtime = time( NULL ) ;
-
- if( !localtime_r( &lcurtime, &curtime ) )
- {
- const unsigned int i_id = (p_image->i_pts / 100000) & 0xFFFFFF;
-
- msg_Warn( p_vout, "failed to get current time. Falling back to legacy snapshot naming" );
-
- if( asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s",
- psz_path, psz_prefix, i_id, psz_format ) < 0 )
- psz_filename = NULL;
- }
- else
- {
- /* suffix with the last decimal digit in 10s of seconds resolution
- * FIXME gni ? */
- const int i_id = (p_image->i_pts / (100*1000)) & 0xFF;
- char psz_curtime[128];
-
- if( !strftime( psz_curtime, sizeof(psz_curtime), "%Y-%m-%d-%Hh%Mm%Ss", &curtime ) )
- strcpy( psz_curtime, "error" );
-
- if( asprintf( &psz_filename, "%s" DIR_SEP "%s%s%1u.%s",
- psz_path, psz_prefix, psz_curtime, i_id, psz_format ) < 0 )
- psz_filename = NULL;
- }
- }
- free( psz_prefix );
- }
- else
- {
- /* The user specified a full path name (including file name) */
- psz_filename = str_format( p_vout, psz_path );
- path_sanitize( psz_filename );
- }
-
- if( !psz_filename )
- goto error;
-
- /* Save the snapshot */
- FILE *p_file = utf8_fopen( psz_filename, "wb" );
- if( !p_file )
- {
- msg_Err( p_vout, "Failed to open '%s'", psz_filename );
- free( psz_filename );
- goto error;
- }
- if( fwrite( p_image->p_buffer, p_image->i_buffer, 1, p_file ) != 1 )
- {
- msg_Err( p_vout, "Failed to write to '%s'", psz_filename );
- fclose( p_file );
- free( psz_filename );
- goto error;
- }
- fclose( p_file );
-
- /* */
- if( ppsz_filename )
- *ppsz_filename = psz_filename;
- else
- free( psz_filename );
-
+ spu_DisplaySubpicture( vout_GetSpu( p_vout ), p_subpic );
return VLC_SUCCESS;
-
-error:
- msg_Err( p_vout, "could not save snapshot" );
- return VLC_EGENERIC;
}
/**
video_format_t *p_fmt,
const char *psz_format, mtime_t i_timeout )
{
- vout_thread_sys_t *p_sys = p_vout->p;
-
- vlc_mutex_lock( &p_sys->snapshot.lock );
- p_sys->snapshot.i_request++;
-
- const mtime_t i_deadline = mdate() + i_timeout;
- while( p_sys->snapshot.b_available && !p_sys->snapshot.p_picture )
- {
- if( vlc_cond_timedwait( &p_sys->snapshot.wait, &p_sys->snapshot.lock,
- i_deadline ) )
- break;
- }
-
- picture_t *p_picture = p_sys->snapshot.p_picture;
- if( p_picture )
- p_sys->snapshot.p_picture = p_picture->p_next;
- else if( p_sys->snapshot.i_request > 0 )
- p_sys->snapshot.i_request--;
- vlc_mutex_unlock( &p_sys->snapshot.lock );
-
+ picture_t *p_picture = vout_snapshot_Get( &p_vout->p->snapshot, i_timeout );
if( !p_picture )
{
msg_Err( p_vout, "Failed to grab a snapshot" );
if( !psz_path )
{
- psz_path = VoutSnapshotGetDefaultDirectory();
+ psz_path = vout_snapshot_GetDirectory();
if( !psz_path )
{
msg_Err( p_vout, "no path specified for snapshots" );
}
}
+ vout_snapshot_save_cfg_t cfg;
+ memset( &cfg, 0, sizeof(cfg) );
+ cfg.is_sequential = var_GetBool( p_vout, "snapshot-sequential" );
+ cfg.sequence = var_GetInteger( p_vout, "snapshot-num" );
+ cfg.path = psz_path;
+ cfg.format = psz_format;
+ cfg.prefix_fmt = psz_prefix;
+
char *psz_filename;
- if( VoutWriteSnapshot( p_vout, &psz_filename,
- p_image,
- psz_path, psz_format, psz_prefix ) )
+ int i_sequence;
+ if (vout_snapshot_SaveImage( &psz_filename, &i_sequence,
+ p_image, VLC_OBJECT(p_vout), &cfg ) )
goto exit;
+ if( cfg.is_sequential )
+ var_SetInteger( p_vout, "snapshot-num", i_sequence + 1 );
VoutOsdSnapshot( p_vout, p_picture, psz_filename );
- /* Generate a media player event - Right now just trigger a global libvlc var
- CHECK: Could not find a more local object. The goal is to communicate
- vout_thread with libvlc_media_player or its input_thread */
- var_SetString( p_vout->p_libvlc, "vout-snapshottaken", psz_filename );
+ /* signal creation of a new snapshot file */
+ var_SetString( p_vout->p_libvlc, "snapshot-file", psz_filename );
+
free( psz_filename );
exit:
free( psz_string );
}
-/*****************************************************************************
- * InitWindowSize: find the initial dimensions the video window should have.
- *****************************************************************************
- * This function will check the "width", "height" and "zoom" config options and
- * will calculate the size that the video window should have.
- *****************************************************************************/
-static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
- unsigned *pi_height )
-{
-#define FP_FACTOR 1000 /* our fixed point factor */
-
- int i_width = var_GetInteger( p_vout, "width" );
- int i_height = var_GetInteger( p_vout, "height" );
- float f_zoom = var_GetFloat( p_vout, "zoom" );
- uint64_t ll_zoom = (uint64_t)( FP_FACTOR * f_zoom );
-
- if( i_width > 0 && i_height > 0)
- {
- *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- }
- else if( i_width > 0 )
- {
- *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
- p_vout->fmt_in.i_sar_den * i_width / p_vout->fmt_in.i_sar_num /
- FP_FACTOR / p_vout->fmt_in.i_visible_width );
- }
- else if( i_height > 0 )
- {
- *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
- p_vout->fmt_in.i_sar_num * i_height / p_vout->fmt_in.i_sar_den /
- FP_FACTOR / p_vout->fmt_in.i_visible_height );
- }
- else if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 )
- {
- msg_Warn( p_vout, "aspect ratio screwed up" );
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
- }
- else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
- {
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
- p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom
- / FP_FACTOR );
- }
- else
- {
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom
- / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
- p_vout->fmt_in.i_sar_den / p_vout->fmt_in.i_sar_num / FP_FACTOR );
- }
-
- msg_Dbg( p_vout, "window size: %ux%u", *pi_width, *pi_height );
-
-#undef FP_FACTOR
-}
-
/*****************************************************************************
* Object variables callbacks
*****************************************************************************/
static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
- vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
- p_vout->i_window_height );
- return VLC_SUCCESS;
+ (void)psz_cmd; (void)oldval; (void)p_data;
+
+ return var_SetFloat( p_this, "scale", newval.f_float );
}
static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
}
crop_end:
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
-
- p_vout->i_changes |= VOUT_CROP_CHANGE;
+ p_vout->p->i_changes |= VOUT_CROP_CHANGE;
msg_Dbg( p_vout, "cropping picture %ix%i to %i,%i,%ix%i",
p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
/* Restore defaults */
p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
p_vout->fmt_in.i_sar_den = p_vout->fmt_render.i_sar_den;
- p_vout->fmt_in.i_aspect = p_vout->fmt_render.i_aspect;
- p_vout->render.i_aspect = p_vout->fmt_render.i_aspect;
if( !psz_parser ) goto aspect_end;
vlc_ureduce( &i_sar_num, &i_sar_den, i_sar_num, i_sar_den, 0 );
p_vout->fmt_in.i_sar_num = i_sar_num;
p_vout->fmt_in.i_sar_den = i_sar_den;
- p_vout->fmt_in.i_aspect = i_aspect_num * VOUT_ASPECT_FACTOR / i_aspect_den;
- p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
aspect_end:
if( p_vout->p->i_par_num && p_vout->p->i_par_den )
{
p_vout->fmt_in.i_sar_num *= p_vout->p->i_par_den;
p_vout->fmt_in.i_sar_den *= p_vout->p->i_par_num;
- p_vout->fmt_in.i_aspect = p_vout->fmt_in.i_aspect *
- p_vout->p->i_par_den / p_vout->p->i_par_num;
- p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
}
- p_vout->i_changes |= VOUT_ASPECT_CHANGE;
+ p_vout->p->i_changes |= VOUT_ASPECT_CHANGE;
- vlc_ureduce( &i_aspect_num, &i_aspect_den,
- p_vout->fmt_in.i_aspect, VOUT_ASPECT_FACTOR, 0 );
msg_Dbg( p_vout, "new aspect-ratio %i:%i, sample aspect-ratio %i:%i",
- i_aspect_num, i_aspect_den,
+ p_vout->fmt_in.i_sar_num * p_vout->fmt_in.i_width,
+ p_vout->fmt_in.i_sar_den * p_vout->fmt_in.i_height,
p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
if( var_Get( p_vout, "crop", &val ) )
vout_thread_t *p_vout = (vout_thread_t *)p_this;
(void)oldval; (void)newval; (void)p_data;
- vlc_mutex_lock( &p_vout->change_lock );
-
if( !strcmp( psz_cmd, "autoscale" ) )
- {
- p_vout->i_changes |= VOUT_SCALE_CHANGE;
- }
+ vout_ControlChangeDisplayFilled( p_vout, newval.b_bool );
else if( !strcmp( psz_cmd, "scale" ) )
- {
- p_vout->i_changes |= VOUT_ZOOM_CHANGE;
- }
-
- vlc_mutex_unlock( &p_vout->change_lock );
+ vout_ControlChangeZoom( p_vout, 1000 * newval.f_float, 1000 );
return VLC_SUCCESS;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
-
- vlc_mutex_lock( &p_vout->change_lock );
- p_vout->i_changes |= VOUT_ON_TOP_CHANGE;
- p_vout->b_on_top = newval.b_bool;
- vlc_mutex_unlock( &p_vout->change_lock );
-
- /* Modify libvlc as well because the vout might have to be restarted */
- var_Create( p_vout->p_libvlc, "video-on-top", VLC_VAR_BOOL );
- var_Set( p_vout->p_libvlc, "video-on-top", newval );
-
(void)psz_cmd; (void)oldval; (void)p_data;
+
+ vout_ControlChangeOnTop( p_vout, newval.b_bool );
return VLC_SUCCESS;
}
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vlc_value_t val;
- (void)psz_cmd; (void)oldval; (void)p_data;
-
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
-
- /* Modify libvlc as well because the vout might have to be restarted */
- var_Create( p_vout->p_libvlc, "fullscreen", VLC_VAR_BOOL );
- var_Set( p_vout->p_libvlc, "fullscreen", newval );
+ (void)psz_cmd; (void)p_data;
- val.b_bool = true;
- var_Set( p_vout, "intf-change", val );
+ if( oldval.b_bool != newval.b_bool )
+ vout_ControlChangeFullscreen( p_vout, newval.b_bool );
return VLC_SUCCESS;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->p->b_title_show = newval.b_bool;
+ p_vout->p->title.show = newval.b_bool;
return VLC_SUCCESS;
}
{
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->p->i_title_timeout = (mtime_t) newval.i_int;
+ p_vout->p->title.timeout = (mtime_t) newval.i_int;
return VLC_SUCCESS;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->p->i_title_position = newval.i_int;
+ p_vout->p->title.position = newval.i_int;
return VLC_SUCCESS;
}