Qt4 - minwidth of dropdown inside settings dialogs, patch by André Weber

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

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index a009f483e148701eb182ddd549aafab587a2e734..1c5d51f84f4c3ac5fda69ede7477b34340ed09ed 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -38,7 +38,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
                            QObject( parent ), p_intf( _p_intf )
 {
     i_old_playing_status = END_S;
-    old_name="";
+    old_name = "";
     p_input = NULL;
     i_rate = 0;
     ON_TIMEOUT( update() );
@@ -79,10 +79,15 @@ void InputManager::delInput()
     }
 }
 
+//TODO break that
 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 )
     {
@@ -95,13 +100,14 @@ void InputManager::update()
     }
 
     /* Update position */
-    mtime_t i_length, i_time;
+    int i_length, i_time; /* Int is enough, since we store seconds */
     float f_pos;
     i_length = var_GetTime( p_input, "length" ) / 1000000;
     i_time = var_GetTime( p_input, "time") / 1000000;
     f_pos = var_GetFloat( p_input, "position" );
     emit positionUpdated( f_pos, i_time, i_length );
- 
+
+    /* Update Rate */
     int i_new_rate = var_GetInteger( p_input, "rate");
     if( i_new_rate != i_rate )
     {
@@ -117,14 +123,15 @@ void InputManager::update()
     {
         val.i_int = 0;
         var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
-        if( val.i_int > 0 )
+        emit navigationChanged( (val.i_int > 0) ? 1 : 2 );
+        /*if( val.i_int > 0 )
         {
             emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 0 = NO
         }
         else
         {
             emit navigationChanged( 2 );
-        }
+        }*/
     }
     else
     {
@@ -162,36 +169,36 @@ 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;
     if( i_old_playing_status != val.i_int )
     {
         i_old_playing_status = val.i_int;
-        emit statusChanged(  val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S );
+        emit statusChanged( val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S );
     }
 }
 
 void InputManager::sliderUpdate( float new_pos )
 {
-    if( hasInput() )
-        var_SetFloat( p_input, "position", new_pos );
+    if( hasInput() ) var_SetFloat( p_input, "position", new_pos );
 }
 
 void InputManager::togglePlayPause()
 {
     vlc_value_t state;
     var_Get( p_input, "state", &state );
-    if( state.i_int != PAUSE_S )
-    {
+    state.i_int = ( ( state.i_int != PAUSE_S ) ? PAUSE_S : PLAYING_S );
+    /*{
         /* A stream is being played, pause it */
-        state.i_int = PAUSE_S;
+       /* state.i_int = PAUSE_S;
     }
     else
     {
         /* Stream is paused, resume it */
-        state.i_int = PLAYING_S;
-    }
+        /*state.i_int = PLAYING_S;
+    }*/
     var_Set( p_input, "state", state );
     emit statusChanged( state.i_int );
 }