Commit 9e76c8c4 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

control/media_instance.c: Silly debug code removal (thanks funman).

parent 3b0c979e
...@@ -82,6 +82,9 @@ static void release_input_thread( libvlc_media_instance_t *p_mi ) ...@@ -82,6 +82,9 @@ static void release_input_thread( libvlc_media_instance_t *p_mi )
/* release for previous vlc_object_get */ /* release for previous vlc_object_get */
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
/* release for initial p_input_thread yield (see _new()) */
vlc_object_release( p_input_thread );
/* No one is tracking this input_thread appart us. Destroy it */ /* No one is tracking this input_thread appart us. Destroy it */
if( p_mi->b_own_its_input_thread ) if( p_mi->b_own_its_input_thread )
{ {
...@@ -91,8 +94,8 @@ static void release_input_thread( libvlc_media_instance_t *p_mi ) ...@@ -91,8 +94,8 @@ static void release_input_thread( libvlc_media_instance_t *p_mi )
var_DelCallback( p_input_thread, "intf-change", input_position_changed, p_mi ); var_DelCallback( p_input_thread, "intf-change", input_position_changed, p_mi );
var_DelCallback( p_input_thread, "intf-change", input_time_changed, p_mi ); var_DelCallback( p_input_thread, "intf-change", input_time_changed, p_mi );
/* We owned this one */ /* We owned this one */
//input_StopThread( p_input_thread ); input_StopThread( p_input_thread );
//var_Destroy( p_input_thread, "drawable" ); var_Destroy( p_input_thread, "drawable" );
//input_DestroyThread( p_input_thread ); //input_DestroyThread( p_input_thread );
} }
else else
...@@ -103,8 +106,6 @@ static void release_input_thread( libvlc_media_instance_t *p_mi ) ...@@ -103,8 +106,6 @@ static void release_input_thread( libvlc_media_instance_t *p_mi )
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
} }
/* release for initial p_input_thread yield (see _new()) */
vlc_object_release( p_input_thread );
} }
/* /*
...@@ -454,6 +455,9 @@ void libvlc_media_instance_set_media_descriptor( ...@@ -454,6 +455,9 @@ void libvlc_media_instance_set_media_descriptor(
release_input_thread( p_mi ); release_input_thread( p_mi );
if( p_mi->p_md )
libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL );
libvlc_media_descriptor_release( p_mi->p_md ); libvlc_media_descriptor_release( p_mi->p_md );
if( !p_md ) if( !p_md )
...@@ -513,15 +517,12 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, ...@@ -513,15 +517,12 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) ) if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) )
{ {
printf(")))))))))))))))))))p_input_thread %p\n", p_input_thread);
/* A thread alread exists, send it a play message */ /* A thread alread exists, send it a play message */
input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S ); input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return; return;
} }
printf(")))))))))))))))))))p_input_thread NOT\n");
/* Ignore previous exception */ /* Ignore previous exception */
libvlc_exception_clear( p_e ); libvlc_exception_clear( p_e );
......
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