Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
e8efd051
Commit
e8efd051
authored
May 09, 2009
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
media_player: cosmetics
(cherry picked from commit
3fa0d24d
)
parent
a81a3d31
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
src/control/media_player.c
src/control/media_player.c
+4
-5
No files found.
src/control/media_player.c
View file @
e8efd051
...
@@ -327,6 +327,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
...
@@ -327,6 +327,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
/* Snapshot initialization */
/* Snapshot initialization */
libvlc_event_manager_register_event_type
(
p_mi
->
p_event_manager
,
libvlc_event_manager_register_event_type
(
p_mi
->
p_event_manager
,
libvlc_MediaPlayerSnapshotTaken
,
p_e
);
libvlc_MediaPlayerSnapshotTaken
,
p_e
);
/* Attach a var callback to the global object to provide the glue between
/* Attach a var callback to the global object to provide the glue between
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
...
@@ -348,8 +349,8 @@ libvlc_media_player_new_from_media(
...
@@ -348,8 +349,8 @@ libvlc_media_player_new_from_media(
libvlc_exception_t
*
p_e
)
libvlc_exception_t
*
p_e
)
{
{
libvlc_media_player_t
*
p_mi
;
libvlc_media_player_t
*
p_mi
;
p_mi
=
libvlc_media_player_new
(
p_md
->
p_libvlc_instance
,
p_e
);
p_mi
=
libvlc_media_player_new
(
p_md
->
p_libvlc_instance
,
p_e
);
if
(
!
p_mi
)
if
(
!
p_mi
)
return
NULL
;
return
NULL
;
...
@@ -376,14 +377,12 @@ libvlc_media_player_t * libvlc_media_player_new_from_input_thread(
...
@@ -376,14 +377,12 @@ libvlc_media_player_t * libvlc_media_player_new_from_input_thread(
}
}
p_mi
=
libvlc_media_player_new
(
p_libvlc_instance
,
p_e
);
p_mi
=
libvlc_media_player_new
(
p_libvlc_instance
,
p_e
);
if
(
!
p_mi
)
if
(
!
p_mi
)
return
NULL
;
return
NULL
;
p_mi
->
p_md
=
libvlc_media_new_from_input_item
(
p_mi
->
p_md
=
libvlc_media_new_from_input_item
(
p_libvlc_instance
,
p_libvlc_instance
,
input_GetItem
(
p_input
),
p_e
);
input_GetItem
(
p_input
),
p_e
);
if
(
!
p_mi
->
p_md
)
if
(
!
p_mi
->
p_md
)
{
{
libvlc_media_player_destroy
(
p_mi
);
libvlc_media_player_destroy
(
p_mi
);
...
@@ -409,11 +408,11 @@ void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
...
@@ -409,11 +408,11 @@ void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
input_thread_t
*
p_input_thread
;
input_thread_t
*
p_input_thread
;
libvlc_exception_t
p_e
;
libvlc_exception_t
p_e
;
libvlc_exception_init
(
&
p_e
);
if
(
!
p_mi
)
if
(
!
p_mi
)
return
;
return
;
libvlc_exception_init
(
&
p_e
);
/* 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
);
"vout-snapshottaken"
,
SnapshotTakenCallback
,
p_mi
);
...
...
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