Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
220f4314
Commit
220f4314
authored
Aug 29, 2009
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
snapshot: replace vout_snapshottaken with snapshot-file
parent
e8795696
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
12 deletions
+7
-12
src/control/media_player.c
src/control/media_player.c
+2
-4
src/video_output/event.h
src/video_output/event.h
+2
-4
src/video_output/vout_intf.c
src/video_output/vout_intf.c
+3
-4
No files found.
src/control/media_player.c
View file @
220f4314
...
@@ -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
);
...
...
src/video_output/event.h
View file @
220f4314
...
@@ -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"
...
...
src/video_output/vout_intf.c
View file @
220f4314
...
@@ -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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment