* vout_intf.c : video output interface
*****************************************************************************
* Copyright (C) 2000-2007 the VideoLAN team
- * $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <stdio.h>
#include <stdlib.h> /* free() */
#include <sys/types.h> /* opendir() */
#include <dirent.h> /* opendir() */
+#include <assert.h>
#include <vlc_interface.h>
#include <vlc_block.h>
#include <vlc_playlist.h>
#include <vlc_vout.h>
+#include <vlc_window.h>
#include <vlc_image.h>
#include <vlc_osd.h>
#include <vlc_charset.h>
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.
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;
-
- 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_detach (wnd);
+ 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;
+ vout_window_t *wnd = p_vout->p_window;
- if( !p_intf ) return VLC_EGENERIC;
-
- 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);
}
/*****************************************************************************
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;
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", 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 |
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_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 );
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_ADDCHOICE, &val, &text );
}
+ /* 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 );
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 );
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_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 );
var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* Add a fullscreen variable */
- if( var_CreateGetBool( p_vout, "fullscreen" ) )
+ if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) )
{
/* user requested fullscreen */
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
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 );
}
/*****************************************************************************
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 )
/* 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" );
{
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;
}
{
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;
}
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;
}
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 );
}
#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 */
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
#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" );
}
}
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 );
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 )
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;
*****************************************************************************/
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" );
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
{
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;
- }
+ if( p_vout->p_window )
+ vout_ReleaseWindow( p_vout->p_window, 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;
}
/*****************************************************************************
p_vout->fmt_in.i_visible_width,
p_vout->fmt_in.i_visible_height );
+ var_SetVoid( p_vout, "crop-update" );
+
return VLC_SUCCESS;
}
var_Set( p_playlist, "fullscreen", newval );
pl_Release( p_playlist );
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
}
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;
}
projects / vlc / blobdiff