[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:17:05 2009 +0300| [fe5240b6aaa1034c7902cd189680bd2ec31ae670] | committer: Rémi Denis-Courmont 

Simplification

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

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

diff --git a/src/input/input.c b/src/input/input.c
index 7a6abbf..2de863f 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1538,24 +1538,22 @@ static void ControlPause( input_thread_t *p_input, mtime_t i_control_date )
         if( i_ret )
         {
             msg_Warn( p_input, "cannot set pause state" );
-            i_state = p_input->p->i_state;
+            return;
         }
     }
 
     /* */
-    if( !i_ret )
+    i_ret = es_out_SetPauseState( p_input->p->p_es_out,
+                                  p_input->p->b_can_pause, true,
+                                  i_control_date );
+    if( i_ret )
     {
-        i_ret = es_out_SetPauseState( p_input->p->p_es_out, p_input->p->b_can_pause, true, i_control_date );
-        if( i_ret )
-        {
-            msg_Warn( p_input, "cannot set pause state at es_out level" );
-            i_state = p_input->p->i_state;
-        }
+        msg_Warn( p_input, "cannot set pause state at es_out level" );
+        return;
     }
 
     /* Switch to new state */
     input_ChangeState( p_input, i_state );
-
 }
 
 static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date )