Commit 6fac1fab authored by Laurent Aimar's avatar Laurent Aimar
Browse files

Cosmetics (simplify after input_Read change).

parent c2766f8b
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
static void Destructor( input_thread_t * p_input ); static void Destructor( input_thread_t * p_input );
static void *Run ( vlc_object_t *p_this ); static void *Run ( vlc_object_t *p_this );
static void *RunAndDestroy ( vlc_object_t *p_this );
static input_thread_t * Create ( vlc_object_t *, input_item_t *, static input_thread_t * Create ( vlc_object_t *, input_item_t *,
const char *, bool, input_resource_t * ); const char *, bool, input_resource_t * );
...@@ -164,13 +163,17 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent, ...@@ -164,13 +163,17 @@ input_thread_t *__input_CreateAndStart( vlc_object_t *p_parent,
*/ */
int __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 )
{ {
input_thread_t *p_input; input_thread_t *p_input = Create( p_parent, p_item, NULL, false, NULL );
p_input = Create( p_parent, p_item, NULL, false, NULL );
if( !p_input ) if( !p_input )
return VLC_EGENERIC; return VLC_EGENERIC;
RunAndDestroy( VLC_OBJECT(p_input) ); if( !Init( p_input ) )
{
MainLoop( p_input );
End( p_input );
}
vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -542,31 +545,6 @@ exit: ...@@ -542,31 +545,6 @@ exit:
return NULL; return NULL;
} }
/*****************************************************************************
* RunAndDestroy: main thread loop
* This is the "just forget me" thread that spawns the input processing chain,
* reads the stream, cleans up and releases memory
*****************************************************************************/
static void *RunAndDestroy( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
const int canc = vlc_savecancel();
if( Init( p_input ) )
goto exit;
MainLoop( p_input );
/* Clean up */
End( p_input );
exit:
/* Release memory */
vlc_object_release( p_input );
vlc_restorecancel( canc );
return NULL;
}
/***************************************************************************** /*****************************************************************************
* Main loop: Fill buffers from access, and demux * Main loop: Fill buffers from access, and demux
*****************************************************************************/ *****************************************************************************/
......
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