Commit bbc37b53 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

input: Make sure we send input state changes events. (Should fix the non...

input: Make sure we send input state changes events. (Should fix the non sending of a play event reported by Rov Juvano).
parent af28383a
...@@ -1550,9 +1550,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1550,9 +1550,7 @@ static bool Control( input_thread_t *p_input, int i_type,
b_force_update = true; b_force_update = true;
/* Switch to play */ /* Switch to play */
p_input->i_state = PLAYING_S; input_ChangeState( p_input, PLAYING_S);
val.i_int = PLAYING_S;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
/* */ /* */
if( !i_ret ) if( !i_ret )
...@@ -1561,7 +1559,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1561,7 +1559,7 @@ static bool Control( input_thread_t *p_input, int i_type,
else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S && else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
p_input->p->b_can_pause ) p_input->p->b_can_pause )
{ {
int i_ret; int i_ret, state;
if( p_input->p->input.p_access ) if( p_input->p->input.p_access )
i_ret = access_Control( p_input->p->input.p_access, i_ret = access_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, true ); ACCESS_SET_PAUSE_STATE, true );
...@@ -1574,16 +1572,15 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1574,16 +1572,15 @@ static bool Control( input_thread_t *p_input, int i_type,
if( i_ret ) if( i_ret )
{ {
msg_Warn( p_input, "cannot set pause state" ); msg_Warn( p_input, "cannot set pause state" );
val.i_int = p_input->i_state; state = p_input->i_state;
} }
else else
{ {
val.i_int = PAUSE_S; state = PAUSE_S;
} }
/* Switch to new state */ /* Switch to new state */
p_input->i_state = val.i_int; input_ChangeState( p_input, state);
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
/* */ /* */
if( !i_ret ) if( !i_ret )
...@@ -1594,8 +1591,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1594,8 +1591,7 @@ static bool Control( input_thread_t *p_input, int i_type,
b_force_update = true; b_force_update = true;
/* Correct "state" value */ /* Correct "state" value */
val.i_int = p_input->i_state; input_ChangeState( p_input, p_input->i_state );
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
} }
else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S ) else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
{ {
......
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