]> git.sesse.net Git - vlc/commitdiff
Simplification
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 23 Aug 2009 15:16:19 +0000 (18:16 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 23 Aug 2009 16:25:52 +0000 (19:25 +0300)
src/input/input.c

index 1e0a4c59797ee55b25ea567e96fe1c1a097be1ab..7a6abbfec44b7f5ec21765e0c1d7600063867733 100644 (file)
@@ -1698,8 +1698,9 @@ static bool Control( input_thread_t *p_input,
         }
 
         case INPUT_CONTROL_SET_STATE:
-            if( ( val.i_int == PLAYING_S && p_input->p->i_state == PAUSE_S ) ||
-                ( val.i_int == PAUSE_S && p_input->p->i_state == PAUSE_S ) )
+            if( val.i_int != PLAYING_S && val.i_int != 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 );
 
@@ -1719,10 +1720,6 @@ static bool Control( input_thread_t *p_input,
                 /* Correct "state" value */
                 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;
 
         case INPUT_CONTROL_SET_RATE: