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
45f5d655
Commit
45f5d655
authored
Feb 29, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
control/event.c: Remove libvlc_event_detach_lock_state().
parent
478c7938
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
24 deletions
+8
-24
src/control/event.c
src/control/event.c
+8
-22
src/control/libvlc_internal.h
src/control/libvlc_internal.h
+0
-2
No files found.
src/control/event.c
View file @
45f5d655
...
...
@@ -345,33 +345,16 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager,
* Remove a callback for an event.
**************************************************************************/
void
libvlc_event_detach
(
libvlc_event_manager_t
*
p_event_manager
,
libvlc_event_type_t
event_type
,
libvlc_callback_t
pf_callback
,
void
*
p_user_data
,
libvlc_exception_t
*
p_e
)
{
libvlc_event_detach_lock_state
(
p_event_manager
,
event_type
,
pf_callback
,
p_user_data
,
libvlc_UnLocked
,
p_e
);
}
/**************************************************************************
* libvlc_event_detach_no_lock (internal) :
*
* Remove a callback for an event.
**************************************************************************/
void
libvlc_event_detach_lock_state
(
libvlc_event_manager_t
*
p_event_manager
,
libvlc_event_type_t
event_type
,
libvlc_callback_t
pf_callback
,
void
*
p_user_data
,
libvlc_lock_state_t
lockstate
,
libvlc_exception_t
*
p_e
)
{
libvlc_event_listeners_group_t
*
listeners_group
;
libvlc_event_listener_t
*
listener
;
int
i
,
j
;
if
(
lockstate
==
libvlc_UnLocked
)
vlc_mutex_lock
(
&
p_event_manager
->
event_sending_lock
);
vlc_mutex_lock
(
&
p_event_manager
->
event_sending_lock
);
vlc_mutex_lock
(
&
p_event_manager
->
object_lock
);
for
(
i
=
0
;
i
<
vlc_array_count
(
&
p_event_manager
->
listeners_groups
);
i
++
)
{
...
...
@@ -386,19 +369,22 @@ void libvlc_event_detach_lock_state( libvlc_event_manager_t *p_event_manager,
listener
->
p_user_data
==
p_user_data
)
{
/* that's our listener */
/* Mark this group as edited so that libvlc_event_send
* will recheck what listener to call */
listeners_group
->
b_sublistener_removed
=
VLC_FALSE
;
free
(
listener
);
vlc_array_remove
(
&
listeners_group
->
listeners
,
j
);
vlc_mutex_unlock
(
&
p_event_manager
->
object_lock
);
if
(
lockstate
==
libvlc_UnLocked
)
vlc_mutex_unlock
(
&
p_event_manager
->
event_sending_lock
);
vlc_mutex_unlock
(
&
p_event_manager
->
event_sending_lock
);
return
;
}
}
}
}
vlc_mutex_unlock
(
&
p_event_manager
->
object_lock
);
if
(
lockstate
==
libvlc_UnLocked
)
vlc_mutex_unlock
(
&
p_event_manager
->
event_sending_lock
);
vlc_mutex_unlock
(
&
p_event_manager
->
event_sending_lock
);
libvlc_exception_raise
(
p_e
,
"This object event manager doesn't know about '%s,%p,%p' event observer"
,
...
...
src/control/libvlc_internal.h
View file @
45f5d655
...
...
@@ -358,8 +358,6 @@ VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj,
VLC_EXPORT
(
void
,
libvlc_event_manager_release
,
(
libvlc_event_manager_t
*
p_em
)
);
VLC_EXPORT
(
void
,
libvlc_event_manager_register_event_type
,
(
libvlc_event_manager_t
*
p_em
,
libvlc_event_type_t
event_type
,
libvlc_exception_t
*
p_e
)
);
VLC_EXPORT
(
void
,
libvlc_event_detach_lock_state
,
(
libvlc_event_manager_t
*
p_event_manager
,
libvlc_event_type_t
event_type
,
libvlc_callback_t
pf_callback
,
void
*
p_user_data
,
libvlc_lock_state_t
lockstate
,
libvlc_exception_t
*
p_e
)
);
VLC_EXPORT
(
void
,
libvlc_event_send
,
(
libvlc_event_manager_t
*
p_em
,
libvlc_event_t
*
p_event
)
);
...
...
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