#include <vlc_strings.h>
#include <vlc_charset.h>
+#include "../libvlc.h"
/*****************************************************************************
* Local prototypes
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 * );
/*****************************************************************************
* vout_RequestWindow: Create/Get a video window if possible.
/* 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 );
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;
}
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, "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 );
+
+ 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" );
+
+ 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 );
+
/* Zoom object var */
var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
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;
}
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;
}
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;
}
/* 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)
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 ? */
+ if( !val.psz_string && p_vout->p_libvlc->psz_datadir )
{
- asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_libvlc->psz_homedir );
+ if( asprintf( &val.psz_string, "%s",
+ p_vout->p_libvlc->psz_datadir ) == -1 )
+ val.psz_string = NULL;
}
#endif
* Did the user specify a directory? If not, 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 );
{
*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
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( val.b_bool )
- vout_Control( p_vout, VOUT_SET_STAY_ON_TOP,
- (vlc_bool_t)!newval.b_bool );
-
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
(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,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+
+ 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;
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff