* src/misc/messages.c, src/input/input.c: revert 16279 and use OBJECT_FLAGS_QUIET...

diff --git a/src/input/input.c b/src/input/input.c
index af45eda0b329bce3246abfc0ad6a813283ff4cee..592d693e10ed80045b6bb6f92466edc365fd4187 100644 (file)
--- 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 acd5059f5f0629fd6d6a15db1c4182cd1028c75b..a7a0885a5dd6338c7f0cf58de47519cbdee506eb 100644 (file)
--- 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;
     }