[vlc-commits] Old RC: remove cargo-cultivated input state checks

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 25 21:53:27 2013 +0200| [136355acb7dcf7b139b9137fd97781fd3b2fc868] | committer: Rémi Denis-Courmont

Old RC: remove cargo-cultivated input state checks

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=136355acb7dcf7b139b9137fd97781fd3b2fc868
---

 modules/control/rc.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 00b3617..553d611 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -498,13 +498,10 @@ static void *Run( void *data )
             /* New input has been registered */
             if( p_input )
             {
-                if( !p_input->b_dead || vlc_object_alive (p_input) )
-                {
-                    char *psz_uri =
-                            input_item_GetURI( input_GetItem( p_input ) );
-                    msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri );
-                    free( psz_uri );
-                }
+                char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
+                msg_rc( STATUS_CHANGE "( new input: %s )", psz_uri );
+                free( psz_uri );
+
                 var_AddCallback( p_input, "intf-event", InputEvent, p_intf );
             }
         }
@@ -521,8 +518,7 @@ static void *Run( void *data )
             }
         }
 
-        if( (p_input != NULL) && !p_input->b_dead && vlc_object_alive (p_input) &&
-            (p_playlist != NULL) )
+        if( p_input != NULL && p_playlist != NULL )
         {
             PL_LOCK;
             int status = playlist_Status( p_playlist );