Make input_Read return the input object id

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 8901de1dca3887cd1ec09575a299b14bdd316bff..a2bc104e7ab08cbda0301de5f8d5776a12a4caca 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -2,7 +2,7 @@
  * vlc_input.h:
  *****************************************************************************
  * Copyright (C) 1999-2004 the VideoLAN team
- * $Id: input_ext-intf.h 7954 2004-06-07 22:19:12Z fenrir $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -413,7 +413,7 @@ VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item
 VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) );
 
 #define input_Read(a,b,c) __input_Read(VLC_OBJECT(a),b, c)
-VLC_EXPORT( void, __input_Read, ( vlc_object_t *, input_item_t *, vlc_bool_t ) );
+VLC_EXPORT( int, __input_Read, ( vlc_object_t *, input_item_t *, vlc_bool_t ) );
 VLC_EXPORT( void,             input_StopThread,     ( input_thread_t * ) );
 VLC_EXPORT( void,             input_DestroyThread,  ( input_thread_t * ) );
 

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;
 }
 
 /**