Qt: remove unneeded margins and parameters

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 7126cf1c45d9b1b51a23bdbbe5a8b420455779cf..dac3bc3dedd6d1ca37a00a2391efce5a11e2a7ee 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -33,10 +33,11 @@
 
 #include "qt4.hpp"
 #include "util/singleton.hpp"
-#include "variables.hpp"
+#include "adapters/variables.hpp"
 
 #include <QObject>
 #include <QEvent>
+class QSignalMapper;
 
 enum { NORMAL,    /* loop: 0, repeat: 0 */
        REPEAT_ONE,/* loop: 0, repeat: 1 */
@@ -140,7 +141,7 @@ public:
     bool hasAudio();
     bool hasVideo() { return hasInput() && b_video; }
     bool hasVisualisation();
-    void requestArtUpdate( input_item_t *p_item );
+    void requestArtUpdate( input_item_t *p_item, bool b_forced );
     void setArt( input_item_t *p_item, QString fileUrl );
 
     QString getName() { return oldName; }
@@ -253,6 +254,7 @@ class MainInputManager : public QObject, public Singleton<MainInputManager>
 {
     Q_OBJECT
     friend class Singleton<MainInputManager>;
+    friend class VLCMenuBar;
 
 public:
     input_thread_t *getInput() { return p_input; }
@@ -270,6 +272,9 @@ public:
 
     void requestVoutUpdate() { return im->UpdateVout(); }
 
+protected:
+    QSignalMapper *menusAudioMapper;
+
 private:
     MainInputManager( intf_thread_t * );
     virtual ~MainInputManager();
@@ -301,6 +306,7 @@ private slots:
     void notifyRepeatLoop( bool );
     void notifyVolume( float );
     void notifyMute( bool );
+    void menusUpdateAudio( const QString& );
 
 signals:
     void inputChanged( input_thread_t * );