X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_intf.c;h=7460763f5e582dc75eeac21912c57e7bd154b5a1;hb=a5c83dda798f93cc7a76bbb50d89352117e6ec46;hp=2385c4e512f1fc16cad0534bafa59f3d69293499;hpb=78e39f0d6ddac05f824b1beb6bfc712088b17fdc;p=vlc diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 2385c4e512..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 * @@ -29,18 +28,20 @@ # include "config.h" #endif -#include +#include #include #include /* free() */ #include /* opendir() */ #include /* opendir() */ +#include #include #include #include #include +#include #include #include #include @@ -87,12 +88,6 @@ 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 ); @@ -104,91 +99,61 @@ void *vout_RequestWindow( vout_thread_t *p_vout, *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; - - vlc_mutex_lock( &p_intf->object_lock ); - if( p_intf->b_dead ) - { - vlc_mutex_unlock( &p_intf->object_lock ); - return; - } + vout_window_t *wnd = p_vout->p_window; - 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 ); + if (wnd == NULL) return; - } + p_vout->p_window = NULL; - 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); } /***************************************************************************** @@ -211,16 +176,16 @@ static const struct 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" }, + { "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 @@ -264,7 +229,7 @@ static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var, 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; @@ -351,7 +316,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) } /* update triggered every time the vout's crop parameters are changed */ - var_Create( p_vout, "crop-update", VLC_VAR_VOID ); + var_Create( p_vout, "crop-update", VLC_VAR_VOID ); /* Add custom crop ratios */ psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" ); @@ -393,7 +358,7 @@ 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; } free( val.psz_string ); @@ -463,7 +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 ); - var_SetBool( p_vout, "intf-change", VLC_TRUE ); + var_SetBool( p_vout, "intf-change", true ); } /***************************************************************************** @@ -505,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" ); @@ -528,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; } @@ -540,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; } @@ -557,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; } @@ -568,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 ); @@ -576,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 */ @@ -622,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 @@ -637,17 +601,19 @@ 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 ); @@ -675,7 +641,7 @@ 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; @@ -720,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 ) @@ -767,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; @@ -792,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" ); @@ -854,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; } /***************************************************************************** @@ -1162,23 +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; + + 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; } @@ -1187,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; }