[Qt] add various toolbars not just one.

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index bbefa84b01dca732898f62b6a4b5c11978278b53..711401e4347a4105b1cb483b28eb4a49500f03a3 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -36,35 +36,42 @@
 #include <QObject>
 #include <QEvent>
 
-static int const PositionUpdate_Type     = QEvent::User + IMEventType + 1;
-static int const ItemChanged_Type        = QEvent::User + IMEventType + 2;
-static int const ItemStateChanged_Type   = QEvent::User + IMEventType + 3;
-static int const ItemTitleChanged_Type   = QEvent::User + IMEventType + 4;
-static int const ItemRateChanged_Type    = QEvent::User + IMEventType + 5;
-static int const VolumeChanged_Type      = QEvent::User + IMEventType + 6;
-static int const ItemSpuChanged_Type     = QEvent::User + IMEventType + 7;
-static int const ItemTeletextChanged_Type= QEvent::User + IMEventType + 8;
-static int const InterfaceVoutUpdate_Type= QEvent::User + IMEventType + 9;
-static int const StatisticsUpdate_Type   = QEvent::User + IMEventType + 10;
-
-static int const FullscreenControlToggle_Type = QEvent::User + IMEventType + 11;
-static int const FullscreenControlShow_Type = QEvent::User + IMEventType + 12;
-static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 13;
-static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 14;
+enum {
+    PositionUpdate_Type = QEvent::User + IMEventType + 1,
+    ItemChanged_Type,
+    ItemStateChanged_Type,
+    ItemTitleChanged_Type,
+    ItemRateChanged_Type,
+    VolumeChanged_Type,
+    ItemEsChanged_Type,
+    ItemTeletextChanged_Type,
+    InterfaceVoutUpdate_Type,
+    StatisticsUpdate_Type,
+    MetaChanged_Type,
+
+    FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
+    FullscreenControlShow_Type,
+    FullscreenControlHide_Type,
+    FullscreenControlPlanHide_Type,
+};
 
 class IMEvent : public QEvent
 {
-public:
+friend class InputManager;
+    public:
     IMEvent( int type, int id ) : QEvent( (QEvent::Type)(type) )
     { i_id = id ; } ;
     virtual ~IMEvent() {};
 
+private:
     int i_id;
 };
 
 class InputManager : public QObject
 {
     Q_OBJECT;
+    friend class MainInputManager;
+
 public:
     InputManager( QObject *, intf_thread_t * );
     virtual ~InputManager();
@@ -75,22 +82,24 @@ public:
     bool hasAudio();
     bool hasVideo() { return hasInput() && b_video; }
 
-    QString getName() { return old_name; }
+    QString getName() { return oldName; }
 
 private:
     intf_thread_t  *p_intf;
     input_thread_t *p_input;
     int             i_input_id;
     int             i_old_playing_status;
-    QString         old_name;
+    QString         oldName;
     QString         artUrl;
     int             i_rate;
     bool            b_video;
     mtime_t         timeA, timeB;
 
     void customEvent( QEvent * );
+
     void addCallbacks();
     void delCallbacks();
+
     void UpdateRate();
     void UpdateMeta();
     void UpdateStatus();
@@ -100,15 +109,15 @@ private:
     void UpdateTeletext();
     void UpdateArt();
     void UpdateVout();
-    void UpdateStats(); // FIXME, remove from this file.
+    void UpdateStats();
 
     void AtoBLoop( int );
 
 public slots:
     void setInput( input_thread_t * ); ///< Our controlled input changed
     void sliderUpdate( float ); ///< User dragged the slider. We get new pos
-    void togglePlayPause();
     /* SpeedRate Rate Management */
+    void reverse();
     void slower();
     void faster();
     void normalRate();
@@ -125,6 +134,8 @@ public slots:
     /* A to B Loop */
     void setAtoB();
 
+private slots:
+    void togglePlayPause();
 
 signals:
     /// Send new position, new time and new length
@@ -171,19 +182,20 @@ public:
 
 private:
     MainInputManager( intf_thread_t * );
+    static MainInputManager *instance;
+
     void customEvent( QEvent * );
 
     InputManager            *im;
     input_thread_t          *p_input;
-
     intf_thread_t           *p_intf;
-    static MainInputManager *instance;
+
 public slots:
-    bool teletextState();
     void togglePlayPause();
     void stop();
     void next();
     void prev();
+
 signals:
     void inputChanged( input_thread_t * );
     void volumeChanged();