Move last.fm password from PasswordShowOnEdit to Password.

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 8b9401f72315459973ad81d5de36fb5468bdc2f0..a825e538d4e4e1363ac0b12ecaa4075c2e93e1b4 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -314,7 +314,7 @@ sout_instance_t * input_DetachSout( input_thread_t *p_input );
 
 /* var.c */
 void input_ControlVarInit ( input_thread_t * );
-void input_ControlVarClean( input_thread_t * );
+void input_ControlVarStop( input_thread_t * );
 void input_ControlVarNavigation( input_thread_t * );
 void input_ControlVarTitle( input_thread_t *, int i_title );
 
@@ -386,13 +386,18 @@ void MRLSplit( char *, const char **, const char **, char ** );
 
 static inline void input_ChangeStateWithVarCallback( input_thread_t *p_input, int state, bool callback )
 {
-    bool changed = (p_input->i_state != state);
+    const bool changed = p_input->i_state != state;
+
+    p_input->i_state = state;
+
     if( callback )
-        var_SetInteger( p_input, "state", p_input->i_state = state );
+    {
+        var_SetInteger( p_input, "state", state );
+    }
     else
     {
         vlc_value_t val;
-        p_input->i_state = val.i_int = state;
+        val.i_int = state;
         var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
     }
     if( changed )