First benefits of QT ! A slider ! (Refs:#80)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 80b6b975f98d2957f13c3d8fae19b3c2fd512fd3..b4d272e8bd73240e44ebed06a94480613c13d79d 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -65,4 +65,6 @@ void InputManager::update()
 
 void InputManager::sliderUpdate( float new_pos )
 {
+   fprintf( stderr, "Seek to %f\n", new_pos );
+   var_SetFloat( p_input, "position", new_pos );
 }

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 4a5c0652b19ba4069db66304eef42f69b106ed9c..2d559fb84944708867d1beb88f8b0418bb661701 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -22,6 +22,7 @@
 
 #include "main_interface.hpp"
 #include "input_manager.hpp"
+#include "util/input_slider.hpp"
 #include "dialogs_provider.hpp"
 #include <QCloseEvent>
 #include <assert.h>
@@ -32,6 +33,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) :
     fprintf( stderr, "QT Main interface\n" );
 
     /* Init UI */
+    slider = new InputSlider( Qt::Horizontal, this ); slider->init();
 
     /* Init input manager */
     p_input = NULL;
@@ -48,7 +50,11 @@ void MainInterface::init()
                    main_input_manager, SLOT( setInput( input_thread_t * ) ) );
 
     /* Connect the slider and the input manager */
-    // both ways 
+    QObject::connect( main_input_manager, SIGNAL(positionUpdated(
+                      float, int, int ) ), slider, SLOT( setPosition( float,int,
+                      int ) ) );
+    QObject::connect( slider, SIGNAL( sliderDragged( float ) ),
+                      main_input_manager, SLOT( sliderUpdate( float ) ) );
 
     /* Connect the display and the input manager */
 }

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index e609cf1d6fdf5907c02ef5d3bbf023e8db370abf..579e14ccf8e63d02403587c14284791c0dd41b8a 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -28,6 +28,7 @@
 
 class InputManager;
 class QCloseEvent;
+class InputSlider;
 
 class MainInterface : public QWidget
 {
@@ -40,6 +41,7 @@ protected:
     void closeEvent( QCloseEvent *);
 private:
     InputManager *main_input_manager;
+    InputSlider *slider;
     intf_thread_t *p_intf;
     /// Main input associated to the playlist
     input_thread_t *p_input;

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index 09050dc48a05ba5c9774ad34c0cd9b8429c8b5ba..b23af1b8c46b65960b3d450d95f9557934ef438e 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -25,10 +25,11 @@
 
 void InputSlider::init()
 {
+    mymove = false;
     setMinimum( 0 );
     setMaximum( 1000 );
     setSingleStep( 2 );
-    setPageStep( 100 );
+    setPageStep( 1000 );
     setTracking( true );
     QObject::connect( this, SIGNAL( valueChanged(int) ), this,
                       SLOT( userDrag( int ) ) );
@@ -36,11 +37,18 @@ void InputSlider::init()
 
 void InputSlider::setPosition( float pos, int a, int b )
 {
+    fprintf( stderr, "Set pos %f\n", pos );
+    mymove = true;
     setValue( (int)(pos * 1000.0 ) );
+    mymove = false;
 }
 
 void InputSlider::userDrag( int new_value )
 {
     float f_pos = (float)(new_value)/1000.0;
-    emit positionUpdated( f_pos );
+    if( !mymove )
+    {
+        fprintf( stderr, "Emitting %f\n", f_pos );
+        emit sliderDragged( f_pos );
+    }
 }

diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp
index b4618e672a56fde739054f1cf5ba015e38769ff7..04ed3b59aa07cb50328c5c164d97f467b20a8a36 100644 (file)
--- a/modules/gui/qt4/util/input_slider.hpp
+++ b/modules/gui/qt4/util/input_slider.hpp
@@ -34,11 +34,13 @@ public:
     {};
     virtual ~InputSlider()   {};
     void init();
+private:
+    bool mymove;
 public slots:
     void setPosition( float, int, int );
 private slots:
     void userDrag( int );
 signals:
-    void positionUpdated( float );
+    void sliderDragged( float );
 };
 #endif