Qt4 - Fix Simple Preference saving...

[vlc] / modules / gui / qt4 / input_manager.cpp

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 18ddc5ca37d6c0babc21fb97c0c7c1752c8a9700..c27ba2ae992b4b2217eacdecf5e27f48ff6316c4 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -40,6 +40,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
     i_old_playing_status = END_S;
     old_name="";
     p_input = NULL;
+    i_rate = 0;
     ON_TIMEOUT( update() );
 }
 
@@ -81,7 +82,11 @@ void InputManager::delInput()
 void InputManager::update()
 {
     /// \todo Emit the signals only if it changed
-    if( !p_input ) return;
+    if( !p_input )
+    {
+        emit nameChanged( "" );
+        return;
+    }
 
     if( p_input->b_dead || p_input->b_die )
     {
@@ -101,7 +106,15 @@ void InputManager::update()
     f_pos = var_GetFloat( p_input, "position" );
     emit positionUpdated( f_pos, i_time, i_length );
 
-    /* Update disc status */
+    int i_new_rate = var_GetInteger( p_input, "rate");
+    if( i_new_rate != i_rate )
+    {
+        i_rate = i_new_rate;
+        /* Update rate */
+        emit rateChanged( i_rate );
+    }
+
+    /* Update navigation status */
     vlc_value_t val; val.i_int = 0;
     var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
     if( val.i_int > 0 )
@@ -109,7 +122,7 @@ void InputManager::update()
         val.i_int = 0;
         var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
         if( val.i_int > 0 )
-        {          
+        {
             emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 0 = NO
         }
         else
@@ -153,6 +166,7 @@ void InputManager::update()
         emit nameChanged( text );
         old_name=text;
     }
+
     /* Update playing status */
     var_Get( p_input, "state", &val );
     val.i_int = val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S;
@@ -233,6 +247,12 @@ void InputManager::normalRate()
         var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
 }
 
+void InputManager::setRate( int new_rate )
+{
+    if( hasInput() )
+        var_SetInteger( p_input, "rate", new_rate );
+}
+
 /**********************************************************************
  * MainInputManager implementation. Wrap an input manager and
  * take care of updating the main playlist input
@@ -323,7 +343,7 @@ static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o,
 {
     InputManager *im = (InputManager*)param;
     im->b_has_audio = true;
-    return 0;
+    return VLC_SUCCESS;
 }
 
 static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o,
@@ -331,5 +351,5 @@ static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o,
 {
     InputManager *im = (InputManager*)param;
     im->b_has_video = true;
-    return 0;
+    return VLC_SUCCESS;
 }