From 92811310df44a1a4a67df142feb783fd09e0f3b7 Mon Sep 17 00:00:00 2001 From: Gildas Bazin <gbazin@videolan.org> Date: Thu, 17 Aug 2006 20:14:14 +0000 Subject: [PATCH] * src/misc/messages.c, src/input/input.c: revert 16279 and use OBJECT_FLAGS_QUIET instead when preparsing. --- src/input/input.c | 7 ++++--- src/misc/messages.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/input/input.c b/src/input/input.c index af45eda0b3..592d693e10 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -324,7 +324,7 @@ int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item ) /* Allocate descriptor */ p_input = Create( p_parent, p_item, NULL, VLC_TRUE ); - p_input->i_flags |= OBJECT_FLAGS_NODBG; + p_input->i_flags |= OBJECT_FLAGS_QUIET; p_input->i_flags |= OBJECT_FLAGS_NOINTERACT; /* Now we can attach our new input */ @@ -447,7 +447,7 @@ static int Run( input_thread_t *p_input ) p_input->b_eof = VLC_TRUE; } - /* Wait we are asked to die */ + /* Wait until we are asked to die */ if( !p_input->b_die ) { Error( p_input ); @@ -479,7 +479,7 @@ static int RunAndClean( input_thread_t *p_input ) if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof ) { - /* We have finish to demux data but not to play them */ + /* We have finished demuxing data but not playing it */ while( !p_input->b_die ) { if( input_EsOutDecodersEmpty( p_input->p_es_out ) ) @@ -489,6 +489,7 @@ static int RunAndClean( input_thread_t *p_input ) msleep( INPUT_IDLE_SLEEP ); } + /* We have finished */ p_input->b_eof = VLC_TRUE; } diff --git a/src/misc/messages.c b/src/misc/messages.c index acd5059f5f..a7a0885a5d 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -312,7 +312,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_queue_id, int i_type, int i; if( p_this == NULL || p_this->i_flags & OBJECT_FLAGS_QUIET || - p_this->i_flags & OBJECT_FLAGS_NODBG ) + (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) { return; } -- 2.25.4