X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=3f79c05827a662e7fd51d93b6a87c43120d17540;hb=c05f65e989890a59efcfe80402fad3574bbf4a13;hp=25a3d71fa71e742b82e90bb962a4cc766340acf7;hpb=7e413aa7c9d60c30c86a7cd84862fc14f4920c83;p=vlc

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 25a3d71fa7..3f79c05827 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -67,7 +67,19 @@
 #define MAX_LINE_LENGTH 256
 #define STATUS_CHANGE "status change: "
 
-static const char *ppsz_input_state[] = { N_("Initializing"), N_("Opening"), N_("Buffer"), N_("Play"), N_("Pause"), N_("Stop"), N_("Error") };
+/* input_state_e from <vlc_input.h> */
+static const char *ppsz_input_state[] = {
+    N_("Initializing"),
+    N_("Opening"),
+    N_("Buffer"),
+    N_("Play"),
+    N_("Pause"),
+    N_("Stop"),
+    N_("Forward"),
+    N_("Backward"),
+    N_("End"),
+    N_("Error"),
+};
 
 /*****************************************************************************
  * Local prototypes
@@ -505,7 +517,7 @@ static void Run( intf_thread_t *p_intf )
             /* New input has been registered */
             if( p_input )
             {
-                if( !p_input->b_dead || !p_input->b_die )
+                if( !p_input->b_dead || vlc_object_alive (p_input) )
                 {
                     char *psz_uri =
                             input_item_GetURI( input_GetItem( p_input ) );
@@ -542,7 +554,7 @@ static void Run( intf_thread_t *p_intf )
             }
         }
 
-        if( (p_input != NULL) && !p_input->b_dead && !p_input->b_die &&
+        if( (p_input != NULL) && !p_input->b_dead && vlc_object_alive (p_input) &&
             (p_playlist != NULL) )
         {
             vlc_object_lock( p_playlist );
@@ -1000,7 +1012,7 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
             cmd[0] = '\0';
         } /* var_GetInteger( p_input, "state" )  */
         msg_rc( STATUS_CHANGE "( %s state: %d ): %s",
-                              &cmd[0], newval.i_int,
+                              cmd, newval.i_int,
                               ppsz_input_state[ newval.i_int ] );
         vlc_object_release( p_playlist );
         vlc_object_release( p_input );