Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 254ac289ae18efa590b49a33a1f1ccf9e2756fa9..a009f483e148701eb182ddd549aafab587a2e734 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() );
 }
 
@@ -88,16 +89,11 @@ void InputManager::update()
         emit positionUpdated( 0.0, 0, 0 );
         emit navigationChanged( 0 );
         i_old_playing_status = 0;
-        emit statusChanged( 0 ); // 0 = STOPPED, 1 = PLAY, 2 = PAUSE
+        emit statusChanged( END_S ); // see vlc_input.h, input_state_e enum
         delInput();
         return;
     }
 
-    if( !b_had_audio && b_has_audio )
-        emit audioStarted();
-    if( !b_had_video && b_has_video )
-        emit videoStarted();
-
     /* Update position */
     mtime_t i_length, i_time;
     float f_pos;
@@ -105,8 +101,16 @@ void InputManager::update()
     i_time = var_GetTime( p_input, "time") / 1000000;
     f_pos = var_GetFloat( p_input, "position" );
     emit positionUpdated( f_pos, i_time, i_length );
+ 
+    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 disc status */
+    /* 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 )
@@ -114,7 +118,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
@@ -238,6 +242,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
@@ -328,7 +338,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,
@@ -336,5 +346,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;
 }