X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=6218844119e4da1620e7b8167e4fc54adf861812;hb=146dad54bff773b990752e44b92aa35f87cbc678;hp=ede2e29bf884070a4651d4132890e55e67063631;hpb=6ecd4022a3d284f86f1ee632952aa81b8157d17f;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index ede2e29bf8..6218844119 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -1,7 +1,7 @@ /***************************************************************************** * vout_intf.c : video output interface ***************************************************************************** - * Copyright (C) 2000-2006 the VideoLAN team + * Copyright (C) 2000-2007 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -25,6 +25,10 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include @@ -32,15 +36,18 @@ #include /* opendir() */ #include /* opendir() */ -#include +#include #include +#include -#include "vlc_video.h" -#include "video_output.h" -#include "vlc_image.h" -#include "vlc_spu.h" +#include +#include +#include +#include -#include +#include +#include +#include "../libvlc.h" /***************************************************************************** * Local prototypes @@ -61,6 +68,13 @@ static int FullscreenCallback( vlc_object_t *, char const *, static int SnapshotCallback( 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. ***************************************************************************** @@ -83,17 +97,15 @@ void *vout_RequestWindow( vout_thread_t *p_vout, 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 *)val.i_int; + if( val.i_int ) return (void *)(intptr_t)val.i_int; /* Find if the main interface supports embedding */ p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE ); @@ -102,7 +114,7 @@ void *vout_RequestWindow( vout_thread_t *p_vout, for( i = 0; i < p_list->i_count; i++ ) { p_intf = (intf_thread_t *)p_list->p_values[i].p_object; - if( p_intf->b_block && p_intf->pf_request_window ) break; + if( p_intf->pf_request_window ) break; p_intf = NULL; } @@ -182,11 +194,79 @@ int vout_ControlWindow( vout_thread_t *p_vout, void *p_window, /***************************************************************************** * 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") }, + { "1:1", "1:1" }, + { "4:3", "4:3" }, + { "16:9", "16:9" }, + { "16:10", "16:10" }, + { "5:4", "5:4" }, + { "5:3", "5:3" }, + { "1.85:1", "1.85:1" }, + { "221:100", "2.21:1" }, + { "235:100", "2.35:1" }, + { "239:100", "2.39: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 ); @@ -197,16 +277,29 @@ void vout_IntfInit( vout_thread_t *p_vout ) VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_vout, "snapshot-num", VLC_VAR_INTEGER ); var_SetInteger( p_vout, "snapshot-num", 1 ); + var_Create( p_vout, "snapshot-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "snapshot-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); 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, "mouse-hide-timeout", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + + 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", 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 | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); @@ -215,37 +308,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 ); @@ -253,58 +334,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 = "221:100"; text.psz_string = "221:100"; - 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 ); - /* 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 ); @@ -335,70 +393,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 = "221:100"; - 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 ); @@ -407,15 +440,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 */ @@ -432,8 +463,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 ); } /***************************************************************************** @@ -442,15 +472,17 @@ void vout_IntfInit( vout_thread_t *p_vout ) int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) { image_handler_t *p_image = image_HandlerCreate( p_vout ); - video_format_t fmt_in = {0}, fmt_out = {0}; + video_format_t fmt_in, fmt_out; char *psz_filename = NULL; subpicture_t *p_subpic; picture_t *p_pif; vlc_value_t val, format; DIR *path; - int i_ret; + 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 ) { @@ -487,18 +519,16 @@ 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 = 320; - fmt_out.i_height = 200; + 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',' ' ); + p_block = ( block_t* ) image_Write( p_image, p_pic, &fmt_in, &fmt_out ); if( !p_block ) { msg_Err( p_vout, "Could not get snapshot" ); image_HandlerDelete( p_image ); vlc_cond_signal( &p_dest->object_wait ); - vlc_mutex_unlock( &p_dest->object_lock ); vlc_object_release( p_dest ); return VLC_EGENERIC; } @@ -511,7 +541,6 @@ 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_mutex_unlock( &p_dest->object_lock ); vlc_object_release( p_dest ); return VLC_ENOMEM; } @@ -529,7 +558,6 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) free( p_snapshot ); image_HandlerDelete( p_image ); vlc_cond_signal( &p_dest->object_wait ); - vlc_mutex_unlock( &p_dest->object_lock ); vlc_object_release( p_dest ); return VLC_ENOMEM; } @@ -541,19 +569,18 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) /* Unlock the object */ vlc_cond_signal( &p_dest->object_wait ); - vlc_mutex_unlock( &p_dest->object_lock ); vlc_object_release( p_dest ); image_HandlerDelete( p_image ); return VLC_SUCCESS; } - #if defined(__APPLE__) || defined(SYS_BEOS) if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) { - asprintf( &val.psz_string, "%s/Desktop", - p_vout->p_libvlc->psz_homedir ); + if( asprintf( &val.psz_string, "%s/Desktop", + p_vout->p_libvlc->psz_homedir ) == -1 ) + val.psz_string = NULL; } #elif defined(WIN32) && !defined(UNDER_CE) @@ -563,7 +590,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) char *p_mypicturesdir = NULL; typedef HRESULT (WINAPI *SHGETFOLDERPATH)( HWND, int, HANDLE, DWORD, - LPSTR ); + LPWSTR ); #ifndef CSIDL_FLAG_CREATE # define CSIDL_FLAG_CREATE 0x8000 #endif @@ -580,45 +607,43 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) /* load the shfolder dll to retrieve SHGetFolderPath */ if( ( shfolder_dll = LoadLibrary( _T("SHFolder.dll") ) ) != NULL ) { - SHGetFolderPath = (void *)GetProcAddress( shfolder_dll, - _T("SHGetFolderPathA") ); - if( SHGetFolderPath != NULL ) - { - p_mypicturesdir = (char *)malloc( MAX_PATH ); - if( p_mypicturesdir ) - { + 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); - if( S_OK != SHGetFolderPath( NULL, - CSIDL_MYPICTURES | CSIDL_FLAG_CREATE, - NULL, SHGFP_TYPE_CURRENT, - p_mypicturesdir ) ) - { - free( p_mypicturesdir ); - p_mypicturesdir = NULL; - } - } - } FreeLibrary( shfolder_dll ); } if( p_mypicturesdir == NULL ) { - asprintf( &val.psz_string, "%s/" CONFIG_DIR, - p_vout->p_libvlc->psz_homedir ); + if( asprintf( &val.psz_string, "%s", + p_vout->p_libvlc->psz_homedir ) == -1 ) + val.psz_string = NULL; } else { - asprintf( &val.psz_string, p_mypicturesdir ); + if( asprintf( &val.psz_string, p_mypicturesdir ) == -1 ) + val.psz_string = NULL; free( p_mypicturesdir ); } } #else - if( !val.psz_string && p_vout->p_libvlc->psz_homedir ) + /* XXX: This saves in the data directory. Shouldn't we try saving + * to psz_homedir/Desktop or something nicer ? */ + char *psz_datadir = config_GetUserDataDir(); + if( !val.psz_string && psz_datadir ) { - asprintf( &val.psz_string, "%s/" CONFIG_DIR, - p_vout->p_libvlc->psz_homedir ); + if( asprintf( &val.psz_string, "%s", psz_datadir ) == -1 ) + val.psz_string = NULL; } + free( psz_datadir ); #endif if( !val.psz_string ) @@ -629,53 +654,90 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) 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" ); } /* * Did the user specify a directory? If not, path = NULL. */ - path = opendir ( (const char *)val.psz_string ); - - if ( path != NULL ) + path = utf8_opendir ( (const char *)val.psz_string ); + if( path != NULL ) { - char *psz_prefix = var_GetString( p_vout, "snapshot-prefix" ); - if( !psz_prefix ) psz_prefix = strdup( "vlcsnap-" ); + char *psz_prefix = var_GetNonEmptyString( p_vout, "snapshot-prefix" ); + if( psz_prefix == NULL ) + psz_prefix = strdup( "vlcsnap-" ); + else + { + char *psz_tmp = str_format( p_vout, psz_prefix ); + filename_sanitize( psz_tmp ); + free( psz_prefix ); + psz_prefix = psz_tmp; + } 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/%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 = fopen( psz_filename, "r" ) ) && !fclose( p_file ) ); + while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) ); var_SetInteger( p_vout, "snapshot-num", i_num ); } else { - asprintf( &psz_filename, "%s/%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 ); } else // The user specified a full path name (including file name) { - asprintf ( &psz_filename, "%s", val.psz_string ); + psz_filename = str_format( p_vout, val.psz_string ); + path_sanitize( psz_filename ); } free( val.psz_string ); free( format.psz_string ); - /* Save the snapshot */ + 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 ) + { + 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 ) + { + 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_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 ) @@ -710,8 +772,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; @@ -735,7 +797,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" ); @@ -749,8 +811,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 @@ -788,6 +854,7 @@ void vout_EnableFilter( vout_thread_t *p_vout, char *psz_name, *****************************************************************************/ int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) { + (void)args; switch( i_query ) { case VOUT_REPARENT: @@ -801,7 +868,7 @@ int vout_vaControlDefault( vout_thread_t *p_vout, int i_query, va_list args ) break; case VOUT_SNAPSHOT: - p_vout->b_snapshot = VLC_TRUE; + p_vout->b_snapshot = true; return VLC_SUCCESS; break; @@ -856,23 +923,28 @@ static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, goto initwsize_end; } - if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den ) + if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 ) { + msg_Warn( p_vout, "fucked up aspect" ); + *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 + *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 + *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 ); } initwsize_end: - msg_Dbg( p_vout, "window size: %dx%d", p_vout->i_window_width, + msg_Dbg( p_vout, "window size: %dx%d", p_vout->i_window_width, p_vout->i_window_height ); #undef FP_FACTOR @@ -885,6 +957,7 @@ 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, @@ -899,6 +972,8 @@ static int CropCallback( vlc_object_t *p_this, char const *psz_cmd, int64_t i_aspect_num, i_aspect_den; unsigned int i_width, i_height; + (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; @@ -1037,6 +1112,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; } @@ -1048,6 +1125,7 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t val; char *psz_end, *psz_parser = strchr( newval.psz_string, ':' ); + (void)psz_cmd; (void)oldval; (void)p_data; /* Restore defaults */ p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num; @@ -1091,8 +1169,6 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_vout, "crop", &val ); return CropCallback( p_this, "crop", val, val, 0 ); - - return VLC_SUCCESS; } static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd, @@ -1101,6 +1177,7 @@ static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd, 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 ); @@ -1116,6 +1193,7 @@ 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; @@ -1124,19 +1202,7 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd, var_Set( p_playlist, "fullscreen", newval ); pl_Release( p_playlist ); - /* Disable "always on top" in fullscreen mode */ - var_Get( p_vout, "video-on-top", &val ); - if( newval.b_bool && val.b_bool ) - { - val.b_bool = VLC_FALSE; - vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, val.b_bool ); - } - else if( !newval.b_bool && val.b_bool ) - { - vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, val.b_bool ); - } - - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); return VLC_SUCCESS; } @@ -1144,7 +1210,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 ); return VLC_SUCCESS; } + +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; +} + +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; +}