Qt: menu, code simplification.

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

diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index 46b398c2590dc9f456bf2ce8d2ec9c547c7e8d6e..463edc5fa4c010df620d80a1c27687b50000b614 100644 (file)
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -50,6 +50,7 @@ typedef enum actionType_e
     REVERSE_ACTION,
     SKIP_BACK_ACTION,
     SKIP_FW_ACTION,
+    QUIT_ACTION,
 } actionType_e;
 
 class ActionsManager : public QObject
@@ -57,10 +58,10 @@ class ActionsManager : public QObject
 
     Q_OBJECT
 public:
-    static ActionsManager *getInstance( intf_thread_t *_p_intf )
+    static ActionsManager *getInstance( intf_thread_t *_p_intf, QObject *_parent = 0 )
     {
         if( !instance )
-            instance = new ActionsManager( _p_intf );
+            instance = new ActionsManager( _p_intf, _parent );
         return instance;
     }
     static void killInstance()
@@ -71,27 +72,22 @@ public:
 
 private:
     static ActionsManager *instance;
-    ActionsManager( intf_thread_t  *_p_i, QObject *_parent = 0 );
+    ActionsManager( intf_thread_t  *_p_i, QObject *_parent );
     intf_thread_t       *p_intf;
 
-protected slots:
-    virtual void doAction( int );
-
-protected slots:
+public slots:
+    void toggleMuteAudio();
+    void AudioUp();
+    void AudioDown();
     void play();
-    void stop();
-    void prev();
-    void next();
+protected slots:
     void fullscreen();
-    void extSettings();
-    void faster();
-    void slower();
-    void reverse();
-    void playlist();
     void snapshot();
+    void playlist();
     void record();
     void frame();
 
+    virtual void doAction( int );
 };
 
 #endif