From 064023b0fc38fc7d351e3d52e1a5de7b11cecc94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Wed, 14 Dec 2005 16:34:46 +0000 Subject: [PATCH] Make input_Read return the input object id --- include/vlc_input.h | 4 ++-- src/input/input.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index 8901de1dca..a2bc104e7a 100644 --- 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 * Laurent Aimar @@ -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 69c4f8c7d8..cd04faa797 100644 --- 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; } /** -- 2.39.5