Commit 1a112b8a authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Revert "dejidjei:"

This reverts commit 5183d34d.
parent dfea366d
ddREADME for the VLC media player README for the VLC media player
=============================== ===============================
The VideoLAN web site . . . http://www.videolan.org/ The VideoLAN web site . . . http://www.videolan.org/
......
...@@ -1157,11 +1157,10 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1157,11 +1157,10 @@ static VLCMain *_o_sharedMainInstance = nil;
if( !p_input ) if( !p_input )
{ {
p_input = playlist_CurrentInput( p_playlist ); p_input = playlist_CurrentInput( p_playlist );
/* Refresh the interface */ /* Refresh the interface */
if( p_input ) if( p_input )
{ {
printf("yield\n");
msg_Dbg( p_intf, "input has changed, refreshing interface" ); msg_Dbg( p_intf, "input has changed, refreshing interface" );
p_intf->p_sys->b_input_update = true; p_intf->p_sys->b_input_update = true;
} }
...@@ -1172,7 +1171,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1172,7 +1171,6 @@ static VLCMain *_o_sharedMainInstance = nil;
p_intf->p_sys->b_intf_update = true; p_intf->p_sys->b_intf_update = true;
p_intf->p_sys->i_play_status = END_S; p_intf->p_sys->i_play_status = END_S;
msg_Dbg( p_intf, "input has stopped, refreshing interface" ); msg_Dbg( p_intf, "input has stopped, refreshing interface" );
printf("release\n");
vlc_object_release( p_input ); vlc_object_release( p_input );
p_input = NULL; p_input = NULL;
} }
......
...@@ -140,7 +140,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item, ...@@ -140,7 +140,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
"input launching for '%s'", psz_name ); "input launching for '%s'", psz_name );
msg_Dbg( p_input, "Creating an input for '%s'", psz_name); msg_Dbg( p_input, "Creating an input for '%s'", psz_name);
printf("Creating an input for '%s'", psz_name);
free( psz_name ); free( psz_name );
...@@ -318,7 +317,6 @@ static void Destructor( input_thread_t * p_input ) ...@@ -318,7 +317,6 @@ static void Destructor( input_thread_t * p_input )
#ifndef NDEBUG #ifndef NDEBUG
char * psz_name = input_item_GetName( p_input->p->input.p_item ); char * psz_name = input_item_GetName( p_input->p->input.p_item );
msg_Dbg( p_input, "Destroying the input for '%s'", psz_name); msg_Dbg( p_input, "Destroying the input for '%s'", psz_name);
printf("Destroying the input for '%s'", psz_name);
free( psz_name ); free( psz_name );
#endif #endif
......
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
#include "playlist/playlist_internal.h" #include "playlist/playlist_internal.h"
#include <vlc_vlm.h> #include <vlc_vlm.h>
#include <vlc_input.h>
#include <assert.h> #include <assert.h>
...@@ -113,9 +112,6 @@ void __vlc_gc_incref( gc_object_t * p_gc ) ...@@ -113,9 +112,6 @@ void __vlc_gc_incref( gc_object_t * p_gc )
{ {
assert( p_gc->i_gc_refcount > 0 ); assert( p_gc->i_gc_refcount > 0 );
char * name = input_item_GetName((input_item_t *)p_gc);
printf("--- %s++ (%d)\n", name, p_gc->i_gc_refcount+1);
free(name);
/* FIXME: atomic version needed! */ /* FIXME: atomic version needed! */
p_gc->i_gc_refcount ++; p_gc->i_gc_refcount ++;
} }
...@@ -124,9 +120,6 @@ void __vlc_gc_decref( gc_object_t *p_gc ) ...@@ -124,9 +120,6 @@ void __vlc_gc_decref( gc_object_t *p_gc )
{ {
assert( p_gc ); assert( p_gc );
assert( p_gc->i_gc_refcount > 0 ); assert( p_gc->i_gc_refcount > 0 );
char * name = input_item_GetName((input_item_t *)p_gc);
printf("--- %s-- (%d)\n", name, p_gc->i_gc_refcount-1);
free(name);
/* FIXME: atomic version needed! */ /* FIXME: atomic version needed! */
p_gc->i_gc_refcount -- ; p_gc->i_gc_refcount -- ;
...@@ -1060,7 +1053,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) ...@@ -1060,7 +1053,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
FOREACH_ARRAY( input_item_t *p_del, priv->input_items ) FOREACH_ARRAY( input_item_t *p_del, priv->input_items )
msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s", msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s",
p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" ); p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" );
//b_clean = false; b_clean = false;
FOREACH_END(); FOREACH_END();
assert( b_clean ); assert( b_clean );
ARRAY_RESET( priv->input_items ); ARRAY_RESET( priv->input_items );
......
...@@ -240,7 +240,6 @@ void playlist_release_current_input( playlist_t * p_playlist ) ...@@ -240,7 +240,6 @@ void playlist_release_current_input( playlist_t * p_playlist )
/* Release the playlist lock, because we may get stuck /* Release the playlist lock, because we may get stuck
* in vlc_object_release() for some time. */ * in vlc_object_release() for some time. */
printf("_______ releasing\n");
PL_UNLOCK; PL_UNLOCK;
vlc_object_release( p_input ); vlc_object_release( p_input );
PL_LOCK; PL_LOCK;
......
...@@ -1522,7 +1522,6 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1522,7 +1522,6 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
p_suxor->p_input = p_input; p_suxor->p_input = p_input;
p_vout->b_filter_change = true; p_vout->b_filter_change = true;
vlc_object_yield( p_input ); vlc_object_yield( p_input );
printf("SUXXXXOR\n");
vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES, vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES,
VLC_THREAD_PRIORITY_LOW, false ); VLC_THREAD_PRIORITY_LOW, false );
} }
......
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