[vlc-devel] commit: Simplification ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 23 18:16:19 2009 +0300| [021709ecdfdf751230bc4a1daa3d83b66501b040] | committer: Rémi Denis-Courmont 

Simplification

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=021709ecdfdf751230bc4a1daa3d83b66501b040
---

 src/input/input.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 1e0a4c5..7a6abbf 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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: