From: Laurent Aimar <fenrir@videolan.org>
Date: Mon, 14 Sep 2009 21:19:16 +0000 (+0200)
Subject: Cosmetics (simplify after input_Read change).
X-Git-Tag: 1.1.0-ff~3359
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6fac1fab592d029286b9ed75713080305f1481ec;p=vlc

Cosmetics (simplify after input_Read change).
---

diff --git a/src/input/input.c b/src/input/input.c
index 62bde42c4f..946d63431e 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -64,7 +64,6 @@
 static void Destructor( input_thread_t * p_input );
 
 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 *,
                                   const char *, bool, input_resource_t * );
@@ -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 )
 {
-    input_thread_t *p_input;
-
-    p_input = Create( p_parent, p_item, NULL, false, NULL );
+    input_thread_t *p_input = Create( p_parent, p_item, NULL, false, NULL );
     if( !p_input )
         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;
 }
 
@@ -542,31 +545,6 @@ exit:
     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
  *****************************************************************************/