# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <stdio.h>
#include <stdlib.h> /* free() */
*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;
+
+#if 0
+ /* FIXME:
+ * This code is utter crap w.r.t. threading. And it has always been.
+ * First, one cannot invoke callbacks from another thread's object.
+ * Not without a well-defined locking convention.
+ *
+ * Second, this would need to "wait" for the interface to be ready.
+ * Otherwise, the availability of the embded window would become
+ * time-dependent.
+ *
+ * In the past, this kind of things worked by accident. This time is over.
+ * -- Courmisch, 12 Jun 2008
+ */
/* Find if the main interface supports embedding */
p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE );
if( !p_list ) return NULL;
else p_vout->p_parent_intf = p_intf;
return p_window;
+#else
+ return NULL;
+#endif
}
void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window )
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" );
}
/* 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" );
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 );
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 );
}
/*****************************************************************************
memset( &fmt_out, 0, sizeof(video_format_t) );
var_Get( p_vout, "snapshot-path", &val );
- if( !*val.psz_string )
+ if( val.psz_string && !*val.psz_string )
{
free( val.psz_string );
val.psz_string = 0;
/* 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" );
}
#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 );
}
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;
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" );
break;
case VOUT_SNAPSHOT:
- p_vout->b_snapshot = VLC_TRUE;
+ p_vout->b_snapshot = true;
return VLC_SUCCESS;
break;
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;
}