X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=a06762ac72b97920cd0c9303b4174611562a9ce0;hb=b57a4d9d1fee564713abea99d74ddbb63c9de13a;hp=16b635d0e921ad1d9b46a8061c64704b88b8d6eb;hpb=4a95265a63091fee2bd7ef99ababec5ff0090b6d;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 16b635d0e9..a06762ac72 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include "../libvlc.h" @@ -52,8 +52,6 @@ /***************************************************************************** * 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 * ); @@ -120,6 +118,8 @@ static const struct { "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 } }; @@ -167,7 +167,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 ); @@ -175,13 +175,11 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 ); @@ -323,18 +321,12 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 @@ -342,16 +334,14 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 ); @@ -367,9 +357,6 @@ void vout_IntfInit( vout_thread_t *p_vout ) 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 ); - - var_Create( p_vout, "intf-change", VLC_VAR_BOOL ); - var_SetBool( p_vout, "intf-change", true ); } /***************************************************************************** @@ -386,7 +373,7 @@ static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic ) if( !p_subpic ) return VLC_EGENERIC; - /* FIXME DEFAULT_CHAN is not good (used by the text) but + /* FIXME SPU_DEFAULT_CHANNEL is not good (used by the text) but * hardcoded 0 doesn't seem right */ p_subpic->i_channel = 0; p_subpic->i_start = mdate(); @@ -398,7 +385,7 @@ static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic ) p_subpic->i_original_picture_width *= 4; p_subpic->i_original_picture_height *= 4; - spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); + spu_DisplaySubpicture( vout_GetSpu( p_vout ), p_subpic ); return VLC_SUCCESS; } @@ -408,7 +395,7 @@ static int VoutSnapshotPip( vout_thread_t *p_vout, picture_t *p_pic ) static void VoutOsdSnapshot( vout_thread_t *p_vout, picture_t *p_pic, const char *psz_filename ) { msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename ); - vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, "%s", psz_filename ); + vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", psz_filename ); if( var_GetBool( p_vout, "snapshot-preview" ) ) { @@ -629,73 +616,14 @@ void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name, 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 ) { + (void)psz_cmd; (void)oldval; (void)p_data; + return var_SetFloat( p_this, "scale", newval.f_float ); } @@ -709,10 +637,10 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, (void)oldval; (void)p_data; /* Restore defaults */ - p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset; - p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width; - p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset; - p_vout->fmt_in.i_visible_height = p_vout->fmt_render.i_visible_height; + p_vout->p->fmt_in.i_x_offset = p_vout->p->fmt_render.i_x_offset; + p_vout->p->fmt_in.i_visible_width = p_vout->p->fmt_render.i_visible_width; + p_vout->p->fmt_in.i_y_offset = p_vout->p->fmt_render.i_y_offset; + p_vout->p->fmt_in.i_visible_height = p_vout->p->fmt_render.i_visible_height; if( !strcmp( psz_cmd, "crop" ) ) { @@ -726,22 +654,22 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, i_aspect_den = strtol( ++psz_parser, &psz_end, 10 ); if( psz_end == psz_parser || !i_aspect_den ) goto crop_end; - i_width = p_vout->fmt_in.i_sar_den*p_vout->fmt_render.i_visible_height * - i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num; - i_height = p_vout->fmt_render.i_visible_width*p_vout->fmt_in.i_sar_num * - i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den; + i_width = p_vout->p->fmt_in.i_sar_den*p_vout->p->fmt_render.i_visible_height * + i_aspect_num / i_aspect_den / p_vout->p->fmt_in.i_sar_num; + i_height = p_vout->p->fmt_render.i_visible_width*p_vout->p->fmt_in.i_sar_num * + i_aspect_den / i_aspect_num / p_vout->p->fmt_in.i_sar_den; - if( i_width < p_vout->fmt_render.i_visible_width ) + if( i_width < p_vout->p->fmt_render.i_visible_width ) { - p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset + - (p_vout->fmt_render.i_visible_width - i_width) / 2; - p_vout->fmt_in.i_visible_width = i_width; + p_vout->p->fmt_in.i_x_offset = p_vout->p->fmt_render.i_x_offset + + (p_vout->p->fmt_render.i_visible_width - i_width) / 2; + p_vout->p->fmt_in.i_visible_width = i_width; } else { - p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset + - (p_vout->fmt_render.i_visible_height - i_height) / 2; - p_vout->fmt_in.i_visible_height = i_height; + p_vout->p->fmt_in.i_y_offset = p_vout->p->fmt_render.i_y_offset + + (p_vout->p->fmt_render.i_visible_height - i_height) / 2; + p_vout->p->fmt_in.i_visible_height = i_height; } } else @@ -767,21 +695,21 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, i_crop_top = strtol( psz_end, &psz_end, 10 ); if( *psz_end != '\0' ) goto crop_end; - if( i_crop_top + i_crop_height >= p_vout->fmt_render.i_visible_height || - i_crop_left + i_crop_width >= p_vout->fmt_render.i_visible_width ) + if( i_crop_top + i_crop_height >= p_vout->p->fmt_render.i_visible_height || + i_crop_left + i_crop_width >= p_vout->p->fmt_render.i_visible_width ) { msg_Err( p_vout, "Unable to crop over picture boundaries"); return VLC_EGENERIC; } i_width = i_crop_width; - p_vout->fmt_in.i_visible_width = i_width; + p_vout->p->fmt_in.i_visible_width = i_width; i_height = i_crop_height; - p_vout->fmt_in.i_visible_height = i_height; + p_vout->p->fmt_in.i_visible_height = i_height; - p_vout->fmt_in.i_x_offset = i_crop_left; - p_vout->fmt_in.i_y_offset = i_crop_top; + p_vout->p->fmt_in.i_x_offset = i_crop_left; + p_vout->p->fmt_in.i_y_offset = i_crop_top; } else { @@ -804,23 +732,23 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, i_crop_bottom = strtol( psz_end, &psz_end, 10 ); if( *psz_end != '\0' ) goto crop_end; - if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height || - i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width ) + if( i_crop_top + i_crop_bottom >= p_vout->p->fmt_render.i_visible_height || + i_crop_right + i_crop_left >= p_vout->p->fmt_render.i_visible_width ) { msg_Err( p_vout, "Unable to crop over picture boundaries" ); return VLC_EGENERIC; } - i_width = p_vout->fmt_render.i_visible_width + i_width = p_vout->p->fmt_render.i_visible_width - i_crop_left - i_crop_right; - p_vout->fmt_in.i_visible_width = i_width; + p_vout->p->fmt_in.i_visible_width = i_width; - i_height = p_vout->fmt_render.i_visible_height + i_height = p_vout->p->fmt_render.i_visible_height - i_crop_top - i_crop_bottom; - p_vout->fmt_in.i_visible_height = i_height; + p_vout->p->fmt_in.i_visible_height = i_height; - p_vout->fmt_in.i_x_offset = i_crop_left; - p_vout->fmt_in.i_y_offset = i_crop_top; + p_vout->p->fmt_in.i_x_offset = i_crop_left; + p_vout->p->fmt_in.i_y_offset = i_crop_top; } } } @@ -836,36 +764,33 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, i_crop_right = var_GetInteger( p_vout, "crop-right" ); i_crop_bottom = var_GetInteger( p_vout, "crop-bottom" ); - if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height || - i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width ) + if( i_crop_top + i_crop_bottom >= p_vout->p->fmt_render.i_visible_height || + i_crop_right + i_crop_left >= p_vout->p->fmt_render.i_visible_width ) { msg_Err( p_vout, "Unable to crop over picture boundaries" ); return VLC_EGENERIC; } - i_width = p_vout->fmt_render.i_visible_width + i_width = p_vout->p->fmt_render.i_visible_width - i_crop_left - i_crop_right; - p_vout->fmt_in.i_visible_width = i_width; + p_vout->p->fmt_in.i_visible_width = i_width; - i_height = p_vout->fmt_render.i_visible_height + i_height = p_vout->p->fmt_render.i_visible_height - i_crop_top - i_crop_bottom; - p_vout->fmt_in.i_visible_height = i_height; + p_vout->p->fmt_in.i_visible_height = i_height; - p_vout->fmt_in.i_x_offset = i_crop_left; - p_vout->fmt_in.i_y_offset = i_crop_top; + p_vout->p->fmt_in.i_x_offset = i_crop_left; + p_vout->p->fmt_in.i_y_offset = i_crop_top; } 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, - p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset, - p_vout->fmt_in.i_visible_width, - p_vout->fmt_in.i_visible_height ); + p_vout->p->fmt_in.i_width, p_vout->p->fmt_in.i_height, + p_vout->p->fmt_in.i_x_offset, p_vout->p->fmt_in.i_y_offset, + p_vout->p->fmt_in.i_visible_width, + p_vout->p->fmt_in.i_visible_height ); var_TriggerCallback( p_vout, "crop-update" ); @@ -883,12 +808,8 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, (void)psz_cmd; (void)oldval; (void)p_data; /* 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->render.i_aspect = (int64_t)p_vout->fmt_render.i_sar_num * - p_vout->fmt_render.i_width * - VOUT_ASPECT_FACTOR / - p_vout->fmt_render.i_sar_den / p_vout->fmt_render.i_height; + p_vout->p->fmt_in.i_sar_num = p_vout->p->fmt_render.i_sar_num; + p_vout->p->fmt_in.i_sar_den = p_vout->p->fmt_render.i_sar_den; if( !psz_parser ) goto aspect_end; @@ -898,31 +819,25 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, i_aspect_den = strtol( ++psz_parser, &psz_end, 10 ); if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end; - i_sar_num = i_aspect_num * p_vout->fmt_render.i_visible_height; - i_sar_den = i_aspect_den * p_vout->fmt_render.i_visible_width; + i_sar_num = i_aspect_num * p_vout->p->fmt_render.i_visible_height; + i_sar_den = i_aspect_den * p_vout->p->fmt_render.i_visible_width; 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->render.i_aspect = i_aspect_num * VOUT_ASPECT_FACTOR / i_aspect_den; + p_vout->p->fmt_in.i_sar_num = i_sar_num; + p_vout->p->fmt_in.i_sar_den = i_sar_den; 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->render.i_aspect = (int64_t)p_vout->fmt_in.i_sar_num * - p_vout->fmt_in.i_width * - VOUT_ASPECT_FACTOR / - p_vout->fmt_in.i_sar_den / - p_vout->fmt_in.i_height; + p_vout->p->fmt_in.i_sar_num *= p_vout->p->i_par_den; + p_vout->p->fmt_in.i_sar_den *= p_vout->p->i_par_num; } - p_vout->i_changes |= VOUT_ASPECT_CHANGE; + p_vout->p->i_changes |= VOUT_ASPECT_CHANGE; msg_Dbg( p_vout, "new aspect-ratio %i:%i, sample aspect-ratio %i:%i", - 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 ); + p_vout->p->fmt_in.i_sar_num * p_vout->p->fmt_in.i_width, + p_vout->p->fmt_in.i_sar_den * p_vout->p->fmt_in.i_height, + p_vout->p->fmt_in.i_sar_num, p_vout->p->fmt_in.i_sar_den ); if( var_Get( p_vout, "crop", &val ) ) return VLC_EGENERIC; @@ -938,18 +853,10 @@ static int ScalingCallback( vlc_object_t *p_this, char const *psz_cmd, 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; } @@ -958,17 +865,9 @@ static int OnTopCallback( 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; - - 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; } @@ -976,15 +875,10 @@ static int FullscreenCallback( 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; - vlc_value_t val; (void)psz_cmd; (void)p_data; - if( oldval.b_bool == newval.b_bool ) - return VLC_SUCCESS; /* no-op */ - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - - 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; } @@ -1005,7 +899,7 @@ static int TitleShowCallback( vlc_object_t *p_this, char const *psz_cmd, 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; } @@ -1014,7 +908,7 @@ static int TitleTimeoutCallback( vlc_object_t *p_this, char const *psz_cmd, { 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; } @@ -1024,6 +918,6 @@ static int TitlePositionCallback( vlc_object_t *p_this, char const *psz_cmd, 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; }