Synchronize NEWS

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 1e62627851496053ea195e439f05b8993a562db8..a85d2940f1f8f0202bda4a64fd727e1f30808804 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -61,6 +61,7 @@ enum {
     RandomChanged_Type,
     LoopChanged_Type,
     RepeatChanged_Type,
+    LeafToParent_Type,
 /*    SignalChanged_Type, */
 
     FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
@@ -77,6 +78,7 @@ enum { NORMAL,    /* loop: 0, repeat: 0 */
 class IMEvent : public QEvent
 {
 friend class InputManager;
+friend class MainInputManager;
     public:
     IMEvent( int type, input_item_t *p_input = NULL )
         : QEvent( (QEvent::Type)(type) )
@@ -111,7 +113,7 @@ public:
 
 class InputManager : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
     friend class MainInputManager;
 
 public:
@@ -142,7 +144,7 @@ private:
     int             i_old_playing_status;
     QString         oldName;
     QString         artUrl;
-    int             i_rate;
+    float           f_rate;
     float           f_cache;
     bool            b_video;
     mtime_t         timeA, timeB;
@@ -201,7 +203,8 @@ private slots:
 signals:
     /// Send new position, new time and new length
     void positionUpdated( float , int64_t, int );
-    void rateChanged( int );
+    void seekRequested( float pos );
+    void rateChanged( float );
     void nameChanged( const QString& );
     /// Used to signal whether we should show navigation buttons
     void titleChanged( bool );
@@ -235,7 +238,7 @@ signals:
 
 class MainInputManager : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
     static MainInputManager *getInstance( intf_thread_t *_p_intf )
     {
@@ -251,6 +254,10 @@ public:
 
     input_thread_t *getInput() { return p_input; }
     InputManager *getIM() { return im; }
+    inline input_item_t *currentInputItem()
+    {
+        return ( p_input ? input_GetItem( p_input ) : NULL );
+    }
 
     vout_thread_t* getVout();
     aout_instance_t *getAout();
@@ -288,6 +295,7 @@ signals:
     void playlistItemRemoved( int itemId );
     void randomChanged( bool );
     void repeatLoopChanged( int );
+    void leafBecameParent( input_item_t * );
 };
 
 #endif