Commit 021709ec authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Simplification

parent b1cb50d4
...@@ -1698,8 +1698,9 @@ static bool Control( input_thread_t *p_input, ...@@ -1698,8 +1698,9 @@ static bool Control( input_thread_t *p_input,
} }
case INPUT_CONTROL_SET_STATE: case INPUT_CONTROL_SET_STATE:
if( ( val.i_int == PLAYING_S && p_input->p->i_state == PAUSE_S ) || if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
( val.i_int == PAUSE_S && p_input->p->i_state == PAUSE_S ) ) msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" );
else if( p_input->p->i_state == PAUSE_S )
{ {
ControlUnpause( p_input, i_control_date ); ControlUnpause( p_input, i_control_date );
...@@ -1719,10 +1720,6 @@ static bool Control( input_thread_t *p_input, ...@@ -1719,10 +1720,6 @@ static bool Control( input_thread_t *p_input,
/* Correct "state" value */ /* Correct "state" value */
input_ChangeState( p_input, p_input->p->i_state ); input_ChangeState( p_input, p_input->p->i_state );
} }
else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
{
msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" );
}
break; break;
case INPUT_CONTROL_SET_RATE: case INPUT_CONTROL_SET_RATE:
......
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