X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=7460763f5e582dc75eeac21912c57e7bd154b5a1;hb=96b4ee1ee2da310e9ea951a29672a7609dbf831e;hp=d8b20839686ddf3150ced8fcc3783261453109f1;hpb=c95c8ab44879f3fc116222802ba61e26d57b260d;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index d8b2083968..7460763f5e 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -2,7 +2,6 @@ * vout_intf.c : video output interface ***************************************************************************** * Copyright (C) 2000-2007 the VideoLAN team - * $Id$ * * Authors: Gildas Bazin * @@ -25,18 +24,24 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include /* free() */ #include /* opendir() */ #include /* opendir() */ +#include #include #include #include #include +#include #include #include #include @@ -63,8 +68,13 @@ static int FullscreenCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int SnapshotCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int TitleCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); + +static int TitleShowCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int TitleTimeoutCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int TitlePositionCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); /***************************************************************************** * vout_RequestWindow: Create/Get a video window if possible. @@ -78,120 +88,150 @@ void *vout_RequestWindow( vout_thread_t *p_vout, unsigned int *pi_width_hint, unsigned int *pi_height_hint ) { - intf_thread_t *p_intf = NULL; - vlc_list_t *p_list; - void *p_window; - vlc_value_t val; - int i; - /* Small kludge */ if( !var_Type( p_vout, "aspect-ratio" ) ) vout_IntfInit( p_vout ); /* Get requested coordinates */ - var_Get( p_vout, "video-x", &val ); - *pi_x_hint = val.i_int ; - var_Get( p_vout, "video-y", &val ); - *pi_y_hint = val.i_int; + *pi_x_hint = var_GetInteger( p_vout, "video-x" ); + *pi_y_hint = var_GetInteger( p_vout, "video-y" ); *pi_width_hint = p_vout->i_window_width; *pi_height_hint = p_vout->i_window_height; /* Check whether someone provided us with a window ID */ - var_Get( p_vout->p_libvlc, "drawable", &val ); - if( val.i_int ) return (void *)(intptr_t)val.i_int; + int drawable = var_CreateGetInteger( p_vout, "drawable" ); + if( drawable ) return (void *)(intptr_t)drawable; - /* Find if the main interface supports embedding */ - p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE ); - if( !p_list ) return NULL; + vout_window_t *wnd = vlc_custom_create (VLC_OBJECT(p_vout), sizeof (*wnd), + VLC_OBJECT_GENERIC, "window"); + if (wnd == NULL) + return NULL; - for( i = 0; i < p_list->i_count; i++ ) - { - p_intf = (intf_thread_t *)p_list->p_values[i].p_object; - if( p_intf->pf_request_window ) break; - p_intf = NULL; - } + wnd->vout = p_vout; + wnd->width = *pi_width_hint; + wnd->height = *pi_height_hint; + wnd->pos_x = *pi_x_hint; + wnd->pos_y = *pi_y_hint; + vlc_object_attach (wnd, p_vout); - if( !p_intf ) + wnd->module = module_Need (wnd, "vout window", 0, 0); + if (wnd->module == NULL) { - vlc_list_release( p_list ); + msg_Dbg (wnd, "no window provider available"); + vlc_object_release (wnd); return NULL; } - - vlc_object_yield( p_intf ); - vlc_list_release( p_list ); - - p_window = p_intf->pf_request_window( p_intf, p_vout, pi_x_hint, pi_y_hint, - pi_width_hint, pi_height_hint ); - - if( !p_window ) vlc_object_release( p_intf ); - else p_vout->p_parent_intf = p_intf; - - return p_window; + p_vout->p_window = wnd; + *pi_width_hint = wnd->width; + *pi_height_hint = wnd->height; + *pi_x_hint = wnd->pos_x; + *pi_y_hint = wnd->pos_y; + return wnd->handle; } -void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window ) +void vout_ReleaseWindow( vout_thread_t *p_vout, void *dummy ) { - intf_thread_t *p_intf = p_vout->p_parent_intf; - - if( !p_intf ) return; + vout_window_t *wnd = p_vout->p_window; - vlc_mutex_lock( &p_intf->object_lock ); - if( p_intf->b_dead ) - { - vlc_mutex_unlock( &p_intf->object_lock ); + if (wnd == NULL) return; - } + p_vout->p_window = NULL; - if( !p_intf->pf_release_window ) - { - msg_Err( p_vout, "no pf_release_window"); - vlc_mutex_unlock( &p_intf->object_lock ); - vlc_object_release( p_intf ); - return; - } - - p_intf->pf_release_window( p_intf, p_window ); + assert (wnd->module); + module_Unneed (wnd, wnd->module); - p_vout->p_parent_intf = NULL; - vlc_mutex_unlock( &p_intf->object_lock ); - vlc_object_release( p_intf ); + vlc_object_release (wnd); + (void)dummy; } -int vout_ControlWindow( vout_thread_t *p_vout, void *p_window, +int vout_ControlWindow( vout_thread_t *p_vout, void *dummy, int i_query, va_list args ) { - intf_thread_t *p_intf = p_vout->p_parent_intf; - int i_ret; - - if( !p_intf ) return VLC_EGENERIC; + vout_window_t *wnd = p_vout->p_window; - vlc_mutex_lock( &p_intf->object_lock ); - if( p_intf->b_dead ) - { - vlc_mutex_unlock( &p_intf->object_lock ); + if (wnd == NULL) return VLC_EGENERIC; - } - if( !p_intf->pf_control_window ) - { - msg_Err( p_vout, "no pf_control_window"); - vlc_mutex_unlock( &p_intf->object_lock ); - return VLC_EGENERIC; - } - - i_ret = p_intf->pf_control_window( p_intf, p_window, i_query, args ); - vlc_mutex_unlock( &p_intf->object_lock ); - return i_ret; + assert (wnd->control); + return wnd->control (wnd, i_query, args); } /***************************************************************************** * vout_IntfInit: called during the vout creation to initialise misc things. *****************************************************************************/ +static const struct +{ + double f_value; + const char *psz_label; +} p_zoom_values[] = { + { 0.25, N_("1:4 Quarter") }, + { 0.5, N_("1:2 Half") }, + { 1, N_("1:1 Original") }, + { 2, N_("2:1 Double") }, + { 0, NULL } }; + +static const struct +{ + const char *psz_value; + const char *psz_label; +} p_crop_values[] = { + { "", N_("Default") }, + { "16:10", "16:10" }, + { "16:9", "16:9" }, + { "185:100", "1.85:1" }, + { "221:100", "2.21:1" }, + { "235:100", "2.35:1" }, + { "239:100", "2.39:1" }, + { "5:3", "5:3" }, + { "4:3", "4:3" }, + { "5:4", "5:4" }, + { "1:1", "1:1" }, + { NULL, NULL } }; + +static const struct +{ + const char *psz_value; + const char *psz_label; +} p_aspect_ratio_values[] = { + { "", N_("Default") }, + { "1:1", "1:1" }, + { "4:3", "4:3" }, + { "16:9", "16:9" }, + { "16:10", "16:10" }, + { "221:100", "2.21: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 ) + { + 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 ) + { + *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; + } + } +} + void vout_IntfInit( vout_thread_t *p_vout ) { vlc_value_t val, text, old_val; - vlc_bool_t b_force_par = VLC_FALSE; + bool b_force_par = false; char *psz_buf; + int i; /* Create a few object variables we'll need later on */ var_Create( p_vout, "snapshot-path", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -207,24 +247,23 @@ 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 ); - var_Create( p_vout, "align", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_vout, "align", &val ); - p_vout->i_alignment = val.i_int; + p_vout->i_alignment = var_CreateGetInteger( p_vout, "align" ); 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, "video-title-show", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "video-title-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "video-title-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "mouse-hide-timeout", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - p_vout->b_title_show = var_GetBool( p_vout, "video-title-show" ); - p_vout->i_title_timeout = (mtime_t) var_GetInteger( p_vout, "video-title-timeout" ); - p_vout->i_title_position = var_GetInteger( p_vout, "video-title-position" ); + p_vout->b_title_show = var_CreateGetBool( p_vout, "video-title-show" ); + p_vout->i_title_timeout = + (mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" ); + p_vout->i_title_position = + var_CreateGetInteger( p_vout, "video-title-position" ); - var_AddCallback( p_vout, "video-title-show", TitleCallback, NULL ); - var_AddCallback( p_vout, "video-title-timeout", TitleCallback, NULL ); - var_AddCallback( p_vout, "video-title-position", TitleCallback, NULL ); + 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 ); /* Zoom object var */ var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND | @@ -234,37 +273,25 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Change( p_vout, "zoom", VLC_VAR_SETTEXT, &text, NULL ); var_Get( p_vout, "zoom", &old_val ); - if( old_val.f_float == 0.25 || - old_val.f_float == 0.5 || - old_val.f_float == 1 || - old_val.f_float == 2 ) + + for( i = 0; p_zoom_values[i].f_value; i++ ) { - var_Change( p_vout, "zoom", VLC_VAR_DELCHOICE, &old_val, NULL ); + if( old_val.f_float == p_zoom_values[i].f_value ) + var_Change( p_vout, "zoom", VLC_VAR_DELCHOICE, &old_val, NULL ); + val.f_float = p_zoom_values[i].f_value; + text.psz_string = _( p_zoom_values[i].psz_label ); + var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); } - val.f_float = 0.25; text.psz_string = _("1:4 Quarter"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - val.f_float = 0.5; text.psz_string = _("1:2 Half"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - val.f_float = 1; text.psz_string = _("1:1 Original"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - val.f_float = 2; text.psz_string = _("2:1 Double"); - var_Change( p_vout, "zoom", VLC_VAR_ADDCHOICE, &val, &text ); - - var_Set( p_vout, "zoom", old_val ); + var_Set( p_vout, "zoom", old_val ); /* Is this really needed? */ var_AddCallback( p_vout, "zoom", ZoomCallback, NULL ); /* Crop offset vars */ - var_Create( p_vout, "crop-left", VLC_VAR_INTEGER ); - var_Create( p_vout, "crop-top", VLC_VAR_INTEGER ); - var_Create( p_vout, "crop-right", VLC_VAR_INTEGER ); - var_Create( p_vout, "crop-bottom", VLC_VAR_INTEGER ); - - var_SetInteger( p_vout, "crop-left", 0 ); - var_SetInteger( p_vout, "crop-top", 0 ); - var_SetInteger( p_vout, "crop-right", 0 ); - var_SetInteger( p_vout, "crop-bottom", 0 ); + var_Create( p_vout, "crop-left", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); + var_Create( p_vout, "crop-top", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); + var_Create( p_vout, "crop-right", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); + var_Create( p_vout, "crop-bottom", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND ); var_AddCallback( p_vout, "crop-left", CropCallback, NULL ); var_AddCallback( p_vout, "crop-top", CropCallback, NULL ); @@ -272,66 +299,35 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_AddCallback( p_vout, "crop-bottom", CropCallback, NULL ); /* Crop object var */ - var_Create( p_vout, "crop", VLC_VAR_STRING | + var_Create( p_vout, "crop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); text.psz_string = _("Crop"); var_Change( p_vout, "crop", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = ""; + val.psz_string = (char*)""; var_Change( p_vout, "crop", VLC_VAR_DELCHOICE, &val, 0 ); - val.psz_string = ""; text.psz_string = _("Default"); - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "1:1"; text.psz_string = "1:1"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "4:3"; text.psz_string = "4:3"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "16:9"; text.psz_string = "16:9"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "16:10"; text.psz_string = "16:10"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "5:4"; text.psz_string = "5:4"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "5:3"; text.psz_string = "5:3"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "1.85:1"; text.psz_string = "1.85:1"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "221:100"; text.psz_string = "2.21:1"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "235:100"; text.psz_string = "2.35:1"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "239:100"; text.psz_string = "2.39:1"; - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); - /* Add custom crop ratios */ - psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" ); - if( psz_buf && *psz_buf ) + for( i = 0; p_crop_values[i].psz_value; i++ ) { - char *psz_cur = psz_buf; - char *psz_next; - while( psz_cur && *psz_cur ) - { - psz_next = strchr( psz_cur, ',' ); - if( psz_next ) - { - *psz_next = '\0'; - psz_next++; - } - val.psz_string = strdup( psz_cur ); - text.psz_string = strdup( psz_cur ); - var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text); - free( val.psz_string ); - free( text.psz_string ); - psz_cur = psz_next; - } + val.psz_string = (char*)p_crop_values[i].psz_value; + text.psz_string = _( p_crop_values[i].psz_label ); + var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text ); } - if( psz_buf ) free( psz_buf ); + + /* update triggered every time the vout's crop parameters are changed */ + 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 ); var_AddCallback( p_vout, "crop", CropCallback, NULL ); var_Get( p_vout, "crop", &old_val ); if( old_val.psz_string && *old_val.psz_string ) var_Change( p_vout, "crop", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 ); - if( old_val.psz_string ) free( old_val.psz_string ); + free( old_val.psz_string ); /* Monitor pixel aspect-ratio */ var_Create( p_vout, "monitor-par", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -362,70 +358,45 @@ void vout_IntfInit( vout_thread_t *p_vout ) msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i", p_vout->i_par_num, p_vout->i_par_den ); - b_force_par = VLC_TRUE; + b_force_par = true; } - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); /* Aspect-ratio object var */ - var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | + var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); text.psz_string = _("Aspect-ratio"); var_Change( p_vout, "aspect-ratio", VLC_VAR_SETTEXT, &text, NULL ); - val.psz_string = ""; + val.psz_string = (char*)""; var_Change( p_vout, "aspect-ratio", VLC_VAR_DELCHOICE, &val, 0 ); - val.psz_string = ""; text.psz_string = _("Default"); - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "1:1"; text.psz_string = "1:1"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "4:3"; text.psz_string = "4:3"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "16:9"; text.psz_string = "16:9"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "16:10"; text.psz_string = "16:10"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "221:100"; text.psz_string = "2.21:1"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "5:4"; text.psz_string = "5:4"; - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); - /* Add custom aspect ratios */ - psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" ); - if( psz_buf && *psz_buf ) + for( i = 0; p_aspect_ratio_values[i].psz_value; i++ ) { - char *psz_cur = psz_buf; - char *psz_next; - while( psz_cur && *psz_cur ) - { - psz_next = strchr( psz_cur, ',' ); - if( psz_next ) - { - *psz_next = '\0'; - psz_next++; - } - val.psz_string = strdup( psz_cur ); - text.psz_string = strdup( psz_cur ); - var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text); - free( val.psz_string ); - free( text.psz_string ); - psz_cur = psz_next; - } + val.psz_string = (char*)p_aspect_ratio_values[i].psz_value; + text.psz_string = _( p_aspect_ratio_values[i].psz_label ); + var_Change( p_vout, "aspect-ratio", VLC_VAR_ADDCHOICE, &val, &text ); } - if( psz_buf ) free( psz_buf ); + + /* Add custom aspect ratios */ + psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" ); + 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 ); if( (old_val.psz_string && *old_val.psz_string) || b_force_par ) var_Change( p_vout, "aspect-ratio", VLC_VAR_TRIGGER_CALLBACKS, 0, 0 ); - if( old_val.psz_string ) free( old_val.psz_string ); + free( old_val.psz_string ); /* 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 ); + var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT + | VLC_VAR_ISCOMMAND ); 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 ); @@ -434,15 +405,13 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); /* Add a fullscreen variable */ - var_Create( p_vout, "fullscreen", VLC_VAR_BOOL ); - text.psz_string = _("Fullscreen"); - var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL ); - var_Change( p_vout, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL ); - if( val.b_bool ) + if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) ) { /* user requested fullscreen */ p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; } + text.psz_string = _("Fullscreen"); + var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL ); var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL ); /* Add a snapshot variable */ @@ -459,8 +428,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER ); var_Create( p_vout, "intf-change", VLC_VAR_BOOL ); - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); + var_SetBool( p_vout, "intf-change", true ); } /***************************************************************************** @@ -477,8 +445,8 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) DIR *path; int i_ret; - memset( &fmt_in, 0, sizeof(video_format_t)); - memset( &fmt_out, 0, sizeof(video_format_t)); + memset( &fmt_in, 0, sizeof(video_format_t) ); + memset( &fmt_out, 0, sizeof(video_format_t) ); var_Get( p_vout, "snapshot-path", &val ); if( val.psz_string && !*val.psz_string ) @@ -502,7 +470,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) /* Destination object-id is following object: */ i_id = atoi( &val.psz_string[7] ); - p_dest = ( vlc_object_t* )vlc_current_object( i_id ); + p_dest = ( vlc_object_t* )vlc_object_get( i_id ); if( !p_dest ) { msg_Err( p_vout, "Cannot find calling object" ); @@ -516,8 +484,6 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) /* Save the snapshot to a memory zone */ fmt_in = p_vout->fmt_in; fmt_out.i_sar_num = fmt_out.i_sar_den = 1; - /* FIXME: should not be hardcoded. We should be able to - specify the snapshot size (snapshot-width and snapshot-height). */ fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" ); fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" ); fmt_out.i_chroma = VLC_FOURCC( 'p','n','g',' ' ); @@ -527,7 +493,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) { msg_Err( p_vout, "Could not get snapshot" ); image_HandlerDelete( p_image ); - vlc_cond_signal( &p_dest->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_dest) ); vlc_object_release( p_dest ); return VLC_EGENERIC; } @@ -539,7 +505,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) { block_Release( p_block ); image_HandlerDelete( p_image ); - vlc_cond_signal( &p_dest->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_dest) ); vlc_object_release( p_dest ); return VLC_ENOMEM; } @@ -556,7 +522,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) block_Release( p_block ); free( p_snapshot ); image_HandlerDelete( p_image ); - vlc_cond_signal( &p_dest->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_dest) ); vlc_object_release( p_dest ); return VLC_ENOMEM; } @@ -567,7 +533,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) block_Release( p_block ); /* Unlock the object */ - vlc_cond_signal( &p_dest->object_wait ); + vlc_object_signal_maybe( VLC_OBJECT(p_dest) ); vlc_object_release( p_dest ); image_HandlerDelete( p_image ); @@ -575,15 +541,15 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) } #if defined(__APPLE__) || defined(SYS_BEOS) - if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) + if( !val.psz_string ) { if( asprintf( &val.psz_string, "%s/Desktop", - p_vout->p_libvlc->psz_homedir ) == -1 ) + config_GetHomeDir() ) == -1 ) val.psz_string = NULL; } #elif defined(WIN32) && !defined(UNDER_CE) - if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) + if( !val.psz_string ) { /* Get the My Pictures folder path */ @@ -621,8 +587,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) if( p_mypicturesdir == NULL ) { - if( asprintf( &val.psz_string, "%s", - p_vout->p_libvlc->psz_homedir ) == -1 ) + if( asprintf( &val.psz_string, "%s", config_GetHomeDir() ) == -1 ) val.psz_string = NULL; } else @@ -636,23 +601,25 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) #else /* XXX: This saves in the data directory. Shouldn't we try saving * to psz_homedir/Desktop or something nicer ? */ - if( !val.psz_string && p_vout->p_libvlc->psz_datadir ) + char *psz_datadir = config_GetUserDataDir(); + if( !val.psz_string && psz_datadir ) { - if( asprintf( &val.psz_string, "%s", - p_vout->p_libvlc->psz_datadir ) == -1 ) + if( asprintf( &val.psz_string, "%s", psz_datadir ) == -1 ) val.psz_string = NULL; } + free( psz_datadir ); #endif if( !val.psz_string ) { msg_Err( p_vout, "no path specified for snapshots" ); + image_HandlerDelete( p_image ); return VLC_EGENERIC; } var_Get( p_vout, "snapshot-format", &format ); if( !format.psz_string || !*format.psz_string ) { - if( format.psz_string ) free( format.psz_string ); + free( format.psz_string ); format.psz_string = strdup( "png" ); } @@ -660,7 +627,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) * Did the user specify a directory? If not, path = NULL. */ path = utf8_opendir ( (const char *)val.psz_string ); - if ( path != NULL ) + if( path != NULL ) { char *psz_prefix = var_GetNonEmptyString( p_vout, "snapshot-prefix" ); if( psz_prefix == NULL ) @@ -674,24 +641,35 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) } closedir( path ); - if( var_GetBool( p_vout, "snapshot-sequential" ) == VLC_TRUE ) + if( var_GetBool( p_vout, "snapshot-sequential" ) == true ) { int i_num = var_GetInteger( p_vout, "snapshot-num" ); FILE *p_file; do { - asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", val.psz_string, - psz_prefix, i_num++, format.psz_string ); + if( asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s", + val.psz_string, psz_prefix, i_num++, + format.psz_string ) == -1 ) + { + msg_Err( p_vout, "could not create snapshot" ); + image_HandlerDelete( p_image ); + return VLC_EGENERIC; + } } while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) ); var_SetInteger( p_vout, "snapshot-num", i_num ); } else { - asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s", val.psz_string, - psz_prefix, - (unsigned int)(p_pic->date / 100000) & 0xFFFFFF, - format.psz_string ); + if( asprintf( &psz_filename, "%s" DIR_SEP "%s%u.%s", + val.psz_string, psz_prefix, + (unsigned int)(p_pic->date / 100000) & 0xFFFFFF, + format.psz_string ) == -1 ) + { + msg_Err( p_vout, "could not create snapshot" ); + image_HandlerDelete( p_image ); + return VLC_EGENERIC; + } } free( psz_prefix ); @@ -708,19 +686,23 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) fmt_out.i_width = var_GetInteger( p_vout, "snapshot-width" ); fmt_out.i_height = var_GetInteger( p_vout, "snapshot-height" ); + fmt_in = p_vout->fmt_in; + if( fmt_out.i_width == 0 && fmt_out.i_height > 0 ) { - float f = (float)p_vout->fmt_in.i_height / fmt_out.i_height; - fmt_out.i_width = p_vout->fmt_in.i_width / f; + fmt_out.i_width = (fmt_in.i_width * fmt_out.i_height) / fmt_in.i_height; } else if( fmt_out.i_height == 0 && fmt_out.i_width > 0 ) { - float f = (float)p_vout->fmt_in.i_width / fmt_out.i_width; - fmt_out.i_height = p_vout->fmt_in.i_height / f; + fmt_out.i_height = (fmt_in.i_height * fmt_out.i_width) / fmt_in.i_width; + } + else + { + fmt_out.i_width = fmt_in.i_width; + fmt_out.i_height = fmt_in.i_height; } /* Save the snapshot */ - fmt_in = p_vout->fmt_in; fmt_out.i_sar_num = fmt_out.i_sar_den = 1; i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename ); if( i_ret != VLC_SUCCESS ) @@ -755,8 +737,8 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) p_subpic->i_channel = 0; p_subpic->i_start = mdate(); p_subpic->i_stop = mdate() + 4000000; - p_subpic->b_ephemer = VLC_TRUE; - p_subpic->b_fade = VLC_TRUE; + p_subpic->b_ephemer = true; + p_subpic->b_fade = true; p_subpic->i_original_picture_width = p_vout->render.i_width * 4; p_subpic->i_original_picture_height = p_vout->render.i_height * 4; @@ -780,7 +762,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) *****************************************************************************/ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, - vlc_bool_t b_add, vlc_bool_t b_setconfig ) + bool b_add, bool b_setconfig ) { char *psz_parser; char *psz_string = config_GetPsz( p_vout, "vout-filter" ); @@ -794,8 +776,12 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, if( !psz_parser ) { psz_parser = psz_string; - asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s", - psz_string, psz_name ); + if( asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s", + psz_string, psz_name ) == -1 ) + { + free( psz_parser ); + return; + } free( psz_parser ); } else @@ -838,23 +824,17 @@ int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) { case VOUT_REPARENT: case VOUT_CLOSE: - if( p_vout->p_parent_intf ) - { - vlc_object_release( p_vout->p_parent_intf ); - p_vout->p_parent_intf = NULL; - } + vout_ReleaseWindow( p_vout, NULL ); return VLC_SUCCESS; - break; case VOUT_SNAPSHOT: - p_vout->b_snapshot = VLC_TRUE; + p_vout->b_snapshot = true; return VLC_SUCCESS; - break; default: msg_Dbg( p_vout, "control query not supported" ); - return VLC_EGENERIC; } + return VLC_EGENERIC; } /***************************************************************************** @@ -1091,6 +1071,8 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, p_vout->fmt_in.i_visible_width, p_vout->fmt_in.i_visible_height ); + var_SetVoid( p_vout, "crop-update" ); + return VLC_SUCCESS; } @@ -1144,25 +1126,25 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, i_aspect_num, i_aspect_den, p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den ); - var_Get( p_vout, "crop", &val ); - return CropCallback( p_this, "crop", val, val, 0 ); + if( var_Get( p_vout, "crop", &val ) ) + return VLC_EGENERIC; - return VLC_SUCCESS; + int i_ret = CropCallback( p_this, "crop", val, val, 0 ); + free( val.psz_string ); + return i_ret; } 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; - playlist_t *p_playlist = pl_Yield( p_this ); vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool ); (void)psz_cmd; (void)oldval; (void)p_data; - /* Modify playlist as well because the vout might have to be restarted */ - var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL ); - var_Set( p_playlist, "video-on-top", newval ); + /* 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 ); - pl_Release( p_this ); return VLC_SUCCESS; } @@ -1171,17 +1153,15 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd, { vout_thread_t *p_vout = (vout_thread_t *)p_this; vlc_value_t val; - playlist_t *p_playlist = pl_Yield( p_this ); (void)psz_cmd; (void)oldval; (void)p_data; p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - /* Modify playlist as well because the vout might have to be restarted */ - var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL ); - var_Set( p_playlist, "fullscreen", newval ); - pl_Release( p_playlist ); + /* 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 ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); return VLC_SUCCESS; } @@ -1189,22 +1169,38 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd, static int SnapshotCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(newval); VLC_UNUSED(p_data); vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_Control( p_vout, VOUT_SNAPSHOT ); - (void)psz_cmd; (void)oldval; (void)newval; (void)p_data; return VLC_SUCCESS; } -static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd, +static int TitleShowCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(p_data); vout_thread_t *p_vout = (vout_thread_t *)p_this; + p_vout->b_title_show = newval.b_bool; + return VLC_SUCCESS; +} - if( !strncmp( psz_cmd, "video-title-show", 16 ) ) - p_vout->b_title_show = newval.b_bool; - else if( !strncmp( psz_cmd, "video-title-timeout", 19 ) ) - p_vout->i_title_timeout = (mtime_t) newval.i_int; - else if( !strncmp( psz_cmd, "video-title-position", 20 ) ) - p_vout->i_title_position = newval.i_int; +static int TitleTimeoutCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data); + vout_thread_t *p_vout = (vout_thread_t *)p_this; + p_vout->i_title_timeout = (mtime_t) newval.i_int; + return VLC_SUCCESS; +} + +static int TitlePositionCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + VLC_UNUSED(p_data); + vout_thread_t *p_vout = (vout_thread_t *)p_this; + p_vout->i_title_position = newval.i_int; return VLC_SUCCESS; }