Commit f8763a6c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

RC: fix segmentation fault due to input state changes - fixes #1620

parent aeb8ed0f
...@@ -525,6 +525,8 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a ) ...@@ -525,6 +525,8 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
*****************************************************************************/ *****************************************************************************/
/* "state" value */ /* "state" value */
/* NOTE: you need to update ppsz_input_state in the RC interface
* if you modify this list. */
enum input_state_e enum input_state_e
{ {
INIT_S = 0, INIT_S = 0,
...@@ -536,7 +538,7 @@ enum input_state_e ...@@ -536,7 +538,7 @@ enum input_state_e
FORWARD_S, FORWARD_S,
BACKWARD_S, BACKWARD_S,
END_S, END_S,
ERROR_S ERROR_S,
}; };
/* "rate" default, min/max /* "rate" default, min/max
......
...@@ -67,7 +67,19 @@ ...@@ -67,7 +67,19 @@
#define MAX_LINE_LENGTH 256 #define MAX_LINE_LENGTH 256
#define STATUS_CHANGE "status change: " #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 * Local prototypes
...@@ -1000,7 +1012,7 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd, ...@@ -1000,7 +1012,7 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
cmd[0] = '\0'; cmd[0] = '\0';
} /* var_GetInteger( p_input, "state" ) */ } /* var_GetInteger( p_input, "state" ) */
msg_rc( STATUS_CHANGE "( %s state: %d ): %s", msg_rc( STATUS_CHANGE "( %s state: %d ): %s",
&cmd[0], newval.i_int, cmd, newval.i_int,
ppsz_input_state[ newval.i_int ] ); ppsz_input_state[ newval.i_int ] );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
vlc_object_release( p_input ); vlc_object_release( p_input );
......
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