Make input_Read return the input object id

[vlc] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index 69c4f8c7d8ed3b8a3b0f88a64c26a6ab3921fb80..cd04faa7973c9fadb22350c9208aa1123999236f 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -266,8 +266,9 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
  * \param p_parent a vlc_object
  * \param p_item an input item
  * \param b_block should we block until read is finished ?
+ * \return the input object id if non blocking, 0 else
  */
-void __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
+int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
                    vlc_bool_t b_block )
 {
     input_thread_t *p_input;                        /* thread descriptor */
@@ -279,6 +280,7 @@ void __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
     if( b_block )
     {
         RunAndClean( p_input );
+        return 0;
     }
     else
     {
@@ -291,6 +293,7 @@ void __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
             return;
         }
     }
+    return p_input->i_object_id;
 }
 
 /**