Commit 220f4314 authored by Erwan Tulou's avatar Erwan Tulou

snapshot: replace vout_snapshottaken with snapshot-file

parent e8795696
...@@ -348,9 +348,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, ...@@ -348,9 +348,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
vout_thread that generates the event and media_player that re-emits it vout_thread that generates the event and media_player that re-emits it
with its own event manager with its own event manager
*/ */
var_Create( p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", var_AddCallback( p_libvlc_instance->p_libvlc_int, "snapshot-file",
VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
var_AddCallback( p_libvlc_instance->p_libvlc_int, "vout-snapshottaken",
SnapshotTakenCallback, p_mi ); SnapshotTakenCallback, p_mi );
return p_mi; return p_mi;
...@@ -387,7 +385,7 @@ static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) ...@@ -387,7 +385,7 @@ static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
/* Detach Callback from the main libvlc object */ /* Detach Callback from the main libvlc object */
var_DelCallback( p_mi->p_libvlc_instance->p_libvlc_int, var_DelCallback( p_mi->p_libvlc_instance->p_libvlc_int,
"vout-snapshottaken", SnapshotTakenCallback, p_mi ); "snapshot-file", SnapshotTakenCallback, p_mi );
/* Release the input thread */ /* Release the input thread */
release_input_thread( p_mi, true ); release_input_thread( p_mi, true );
......
...@@ -220,10 +220,8 @@ static inline void vout_SendEventSourceCrop(vout_thread_t *vout, ...@@ -220,10 +220,8 @@ static inline void vout_SendEventSourceCrop(vout_thread_t *vout,
#if 0 #if 0
static inline void vout_SendEventSnapshot(vout_thread_t *vout, const char *filename) static inline void vout_SendEventSnapshot(vout_thread_t *vout, const char *filename)
{ {
/* Generate a media player event - Right now just trigger a global libvlc var /* signal creation of a new snapshot file */
CHECK: Could not find a more local object. The goal is to communicate var_SetString(vout->p_libvlc, "snapshot-file", filename);
vout_thread with libvlc_media_player or its input_thread */
var_SetString(vout->p_libvlc, "vout-snapshottaken", filename);
} }
#warning "FIXME clean up postproc event" #warning "FIXME clean up postproc event"
......
...@@ -504,10 +504,9 @@ static void VoutSaveSnapshot( vout_thread_t *p_vout ) ...@@ -504,10 +504,9 @@ static void VoutSaveSnapshot( vout_thread_t *p_vout )
VoutOsdSnapshot( p_vout, p_picture, psz_filename ); VoutOsdSnapshot( p_vout, p_picture, psz_filename );
/* Generate a media player event - Right now just trigger a global libvlc var /* signal creation of a new snapshot file */
CHECK: Could not find a more local object. The goal is to communicate var_SetString( p_vout->p_libvlc, "snapshot-file", psz_filename );
vout_thread with libvlc_media_player or its input_thread */
var_SetString( p_vout->p_libvlc, "vout-snapshottaken", psz_filename );
free( psz_filename ); free( psz_filename );
exit: exit:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment