Commit 064023b0 authored by Clément Stenac's avatar Clément Stenac

Make input_Read return the input object id

parent 34b42b0b
......@@ -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 * ) );
......
......@@ -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;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment