[vlc-devel] commit: Revert "dejidjei:" (Pierre d'Herbemont )
git version control
git at videolan.org
Wed Jul 9 23:20:14 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed Jul 9 23:22:30 2008 +0200| [1a112b8a40daf2a86ad1aa310b8eb4fe1255bdce]
Revert "dejidjei:"
This reverts commit 5183d34db7b6640a79aeb4f919d8825df3694c2b.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a112b8a40daf2a86ad1aa310b8eb4fe1255bdce
---
README | 2 +-
modules/gui/macosx/intf.m | 4 +---
src/input/input.c | 2 --
src/libvlc.c | 9 +--------
src/playlist/engine.c | 1 -
src/video_output/video_output.c | 1 -
6 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/README b/README
index 7bbe935..394e951 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-ddREADME for the VLC media player
+README for the VLC media player
===============================
The VideoLAN web site . . . http://www.videolan.org/
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index f903aaa..aa52907 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1157,11 +1157,10 @@ static VLCMain *_o_sharedMainInstance = nil;
if( !p_input )
{
p_input = playlist_CurrentInput( p_playlist );
+
/* Refresh the interface */
if( p_input )
{
- printf("yield\n");
-
msg_Dbg( p_intf, "input has changed, refreshing interface" );
p_intf->p_sys->b_input_update = true;
}
@@ -1172,7 +1171,6 @@ static VLCMain *_o_sharedMainInstance = nil;
p_intf->p_sys->b_intf_update = true;
p_intf->p_sys->i_play_status = END_S;
msg_Dbg( p_intf, "input has stopped, refreshing interface" );
- printf("release\n");
vlc_object_release( p_input );
p_input = NULL;
}
diff --git a/src/input/input.c b/src/input/input.c
index 42a575e..d23cd4f 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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 );
msg_Dbg( p_input, "Creating an input for '%s'", psz_name);
- printf("Creating an input for '%s'", psz_name);
free( psz_name );
@@ -318,7 +317,6 @@ static void Destructor( input_thread_t * p_input )
#ifndef NDEBUG
char * psz_name = input_item_GetName( p_input->p->input.p_item );
msg_Dbg( p_input, "Destroying the input for '%s'", psz_name);
- printf("Destroying the input for '%s'", psz_name);
free( psz_name );
#endif
diff --git a/src/libvlc.c b/src/libvlc.c
index 496c013..7340e36 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -94,7 +94,6 @@
#include "playlist/playlist_internal.h"
#include <vlc_vlm.h>
-#include <vlc_input.h>
#include <assert.h>
@@ -113,9 +112,6 @@ void __vlc_gc_incref( gc_object_t * p_gc )
{
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! */
p_gc->i_gc_refcount ++;
}
@@ -124,9 +120,6 @@ void __vlc_gc_decref( gc_object_t *p_gc )
{
assert( p_gc );
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! */
p_gc->i_gc_refcount -- ;
@@ -1060,7 +1053,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
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",
p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" );
- //b_clean = false;
+ b_clean = false;
FOREACH_END();
assert( b_clean );
ARRAY_RESET( priv->input_items );
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 45b95cc..bb0f2e4 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -240,7 +240,6 @@ void playlist_release_current_input( playlist_t * p_playlist )
/* Release the playlist lock, because we may get stuck
* in vlc_object_release() for some time. */
- printf("_______ releasing\n");
PL_UNLOCK;
vlc_object_release( p_input );
PL_LOCK;
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 17db1c2..4c11505 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1522,7 +1522,6 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
p_suxor->p_input = p_input;
p_vout->b_filter_change = true;
vlc_object_yield( p_input );
- printf("SUXXXXOR\n");
vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES,
VLC_THREAD_PRIORITY_LOW, false );
}
More information about the vlc-devel
mailing list