#include <stdio.h>
#include <stdlib.h> /* free() */
#include <sys/types.h> /* opendir() */
+#include <sys/stat.h>
#include <dirent.h> /* opendir() */
#include <assert.h>
#include <vlc_strings.h>
#include <vlc_charset.h>
#include "../libvlc.h"
+#include "vout_internal.h"
/*****************************************************************************
* Local prototypes
wnd->pos_y = *pi_y_hint;
vlc_object_attach (wnd, p_vout);
- wnd->module = module_Need (wnd, "vout window", 0, 0);
+ wnd->module = module_need (wnd, "vout_window", NULL, false);
if (wnd->module == NULL)
{
msg_Dbg (wnd, "no window provider available");
p_vout->p_window = NULL;
assert (wnd->module);
- module_Unneed (wnd, wnd->module);
+ module_unneed (wnd, wnd->module);
vlc_object_release (wnd);
(void)dummy;
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 =
+ p_vout->p->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
+ p_vout->p->i_title_timeout =
(mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
- p_vout->i_title_position =
+ p_vout->p->i_title_position =
var_CreateGetInteger( p_vout, "video-title-position" );
var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL );
}
if( !i_aspect_num || !i_aspect_den ) i_aspect_num = i_aspect_den = 1;
- p_vout->i_par_num = i_aspect_num;
- p_vout->i_par_den = i_aspect_den;
+ p_vout->p->i_par_num = i_aspect_num;
+ p_vout->p->i_par_den = i_aspect_den;
- vlc_ureduce( &p_vout->i_par_num, &p_vout->i_par_den,
- p_vout->i_par_num, p_vout->i_par_den, 0 );
+ vlc_ureduce( &p_vout->p->i_par_num, &p_vout->p->i_par_den,
+ p_vout->p->i_par_num, p_vout->p->i_par_den, 0 );
msg_Dbg( p_vout, "overriding monitor pixel aspect-ratio: %i:%i",
- p_vout->i_par_num, p_vout->i_par_den );
+ p_vout->p->i_par_num, p_vout->p->i_par_den );
b_force_par = true;
}
free( val.psz_string );
if( !p_pip )
return VLC_EGENERIC;
- p_subpic = spu_CreateSubpicture( p_vout->p_spu );
+ p_subpic = subpicture_New();
if( p_subpic == NULL )
{
picture_Release( p_pip );
fmt_out.i_sar_num =
fmt_out.i_sar_den = 0;
- p_subpic->p_region = spu_CreateRegion( p_vout->p_spu, &fmt_out );
+ p_subpic->p_region = subpicture_region_New( &fmt_out );
if( p_subpic->p_region )
- vout_CopyPicture( p_image->p_parent, &p_subpic->p_region->picture, p_pip );
- picture_Release( p_pip );
+ {
+ picture_Release( p_subpic->p_region->p_picture );
+ p_subpic->p_region->p_picture = p_pip;
+ }
+ else
+ {
+ picture_Release( p_pip );
+ }
spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
return VLC_SUCCESS;
/**
* This function will return the default directory used for snapshots
*/
-static char *VoutSnapshotGetDefaultDirectory( vout_thread_t *p_vout )
+static char *VoutSnapshotGetDefaultDirectory( void )
{
- char *psz_path;
+ char *psz_path = NULL;
#if defined(__APPLE__) || defined(SYS_BEOS)
if( asprintf( &psz_path, "%s/Desktop",
DIR *path;
int i_ret;
bool b_embedded_snapshot;
- uintmax_t i_id = (uintmax_t)NULL;
+ uintmax_t i_id = (uintptr_t)NULL;
/* */
val.psz_string = var_GetNonEmptyString( p_vout, "snapshot-path" );
/* */
memset( &fmt_in, 0, sizeof(video_format_t) );
- fmt_in = p_vout->fmt_in;
+ fmt_in = p_vout->fmt_out;
if( fmt_in.i_sar_num <= 0 || fmt_in.i_sar_den <= 0 )
{
fmt_in.i_sar_num =
snapshot_t *p_snapshot;
size_t i_size;
- /* Object must be locked. We will unlock it once we get the
- snapshot and written it to p_private */
+ vlc_object_lock( p_dest );
p_dest->p_private = NULL;
/* Save the snapshot to a memory zone */
{
msg_Err( p_vout, "Could not get snapshot" );
image_HandlerDelete( p_image );
- vlc_object_signal( p_dest );
- vlc_object_release( p_dest );
+ vlc_object_signal_unlocked( p_dest );
+ vlc_object_unlock( p_dest );
return VLC_EGENERIC;
}
{
block_Release( p_block );
image_HandlerDelete( p_image );
- vlc_object_signal( p_dest );
- vlc_object_release( p_dest );
+ vlc_object_signal_unlocked( p_dest );
+ vlc_object_unlock( p_dest );
return VLC_ENOMEM;
}
block_Release( p_block );
free( p_snapshot );
image_HandlerDelete( p_image );
- vlc_object_signal( p_dest );
- vlc_object_release( p_dest );
+ vlc_object_signal_unlocked( p_dest );
+ vlc_object_unlock( p_dest );
return VLC_ENOMEM;
}
memcpy( p_snapshot->p_data, p_block->p_buffer, p_block->i_buffer );
block_Release( p_block );
/* Unlock the object */
- vlc_object_signal( p_dest );
- vlc_object_release( p_dest );
+ vlc_object_signal_unlocked( p_dest );
+ vlc_object_unlock( p_dest );
image_HandlerDelete( p_image );
return VLC_SUCCESS;
/* Get default directory if none provided */
if( !val.psz_string )
- val.psz_string = VoutSnapshotGetDefaultDirectory( p_vout );
+ val.psz_string = VoutSnapshotGetDefaultDirectory( );
if( !val.psz_string )
{
msg_Err( p_vout, "no path specified for snapshots" );
if( var_GetBool( p_vout, "snapshot-sequential" ) == true )
{
int i_num = var_GetInteger( p_vout, "snapshot-num" );
- FILE *p_file;
+ struct stat st;
+
do
{
+ free( psz_filename );
if( asprintf( &psz_filename, "%s" DIR_SEP "%s%05d.%s",
val.psz_string, psz_prefix, i_num++,
format.psz_string ) == -1 )
return VLC_EGENERIC;
}
}
- while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
+ while( utf8_stat( psz_filename, &st ) == 0 );
+
var_SetInteger( p_vout, "snapshot-num", i_num );
}
else
msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN,
"%s", psz_filename );
+
+ /* Generate a media player event - Right now just trigger a global libvlc var
+ CHECK: Could not find a more local object. The goal is to communicate
+ vout_thread with libvlc_media_player or its input_thread*/
+ val.psz_string = psz_filename ;
+
+ var_Set( p_vout->p_libvlc, "vout-snapshottaken", val );
+ /* var_Set duplicates data for transport so we can free*/
free( psz_filename );
/* */
return VLC_SUCCESS;
case VOUT_SNAPSHOT:
- p_vout->b_snapshot = true;
+ p_vout->p->b_snapshot = true;
return VLC_SUCCESS;
default:
p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
aspect_end:
- if( p_vout->i_par_num && p_vout->i_par_den )
+ if( p_vout->p->i_par_num && p_vout->p->i_par_den )
{
- p_vout->fmt_in.i_sar_num *= p_vout->i_par_den;
- p_vout->fmt_in.i_sar_den *= p_vout->i_par_num;
+ p_vout->fmt_in.i_sar_num *= p_vout->p->i_par_den;
+ p_vout->fmt_in.i_sar_den *= p_vout->p->i_par_num;
p_vout->fmt_in.i_aspect = p_vout->fmt_in.i_aspect *
- p_vout->i_par_den / p_vout->i_par_num;
+ p_vout->p->i_par_den / p_vout->p->i_par_num;
p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
}
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;
+ p_vout->p->b_title_show = newval.b_bool;
return VLC_SUCCESS;
}
{
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;
+ p_vout->p->i_title_timeout = (mtime_t) newval.i_int;
return VLC_SUCCESS;
}
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;
+ p_vout->p->i_title_position = newval.i_int;
return VLC_SUCCESS;
}