[vlc-devel] commit: input: kill all the children [add evil laughters here] ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Jun 15 18:46:41 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jun 15 19:32:33 2008 +0300| [1a7f1a447036710c49b67d0471a7b4af57583a94]
input: kill all the children [add evil laughters here]
No need for vlc_object_find()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a7f1a447036710c49b67d0471a7b4af57583a94
---
src/input/input.c | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index c954bb5..3b1849d 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -449,28 +449,10 @@ void input_StopThread( input_thread_t *p_input )
/* We cannot touch p_input fields directly (we come from another thread),
* so use the vlc_object_find way, it's perfectly safe */
- /* Set die for all access */
- p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD );
+ /* Set die for all access, stream, demux, etc */
+ p_list = vlc_list_children( p_input );
for( i = 0; i < p_list->i_count; i++ )
- {
- vlc_object_kill( p_list->p_values[i].p_object );
- }
- vlc_list_release( p_list );
-
- /* Set die for all stream */
- p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD );
- for( i = 0; i < p_list->i_count; i++ )
- {
vlc_object_kill( p_list->p_values[i].p_object );
- }
- vlc_list_release( p_list );
-
- /* Set die for all demux */
- p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD );
- for( i = 0; i < p_list->i_count; i++ )
- {
- vlc_object_kill( p_list->p_values[i].p_object );
- }
vlc_list_release( p_list );
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
More information about the vlc-devel
mailing list