Fix #1768

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index b5ea638038a05a34c3c1738034d6e5be61d2f468..6cccdf70fd3c590254a3a4d4f38f7287c27240f6 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -36,16 +36,19 @@
 #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 FullscreenControlShow_Type = QEvent::User + IMEventType + 7;
-static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 8;
-static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 9;
-static int const ItemSpuChanged_Type = QEvent::User + IMEventType + 10;
+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 FullscreenControlToggle_Type = QEvent::User + IMEventType + 10;
+static int const FullscreenControlShow_Type = QEvent::User + IMEventType + 11;
+static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 12;
+static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 13;
 
 class IMEvent : public QEvent
 {
@@ -65,10 +68,12 @@ public:
     virtual ~InputManager();
 
     void delInput();
-    bool hasInput() { return p_input && !p_input->b_dead && !p_input->b_die; }
+    bool hasInput() { return p_input && !p_input->b_dead && vlc_object_alive (p_input); }
     bool hasAudio();
     bool hasVideo();
 
+    QString getName() { return old_name; }
+
 private:
     intf_thread_t  *p_intf;
     input_thread_t *p_input;
@@ -77,6 +82,7 @@ private:
     QString         old_name;
     QString         artUrl;
     int             i_rate;
+    bool            b_transparentTelextext;
 
     void customEvent( QEvent * );
     void addCallbacks();
@@ -87,6 +93,7 @@ private:
     void UpdateNavigation();
     void UpdatePosition();
     void UpdateSPU();
+    void UpdateTeletext();
     void UpdateArt();
 
 public slots:
@@ -102,7 +109,8 @@ public slots:
     void sectionMenu();
     void telexGotoPage( int ); ///< Goto teletext page
     void telexToggle( bool );  ///< Enable disable teletext buttons
-    void telexSetTransparency( bool ); ///< Set transparency on teletext background
+    void telexToggleButtons(); ///< Toggle buttons after click
+    void telexSetTransparency(); ///< Set transparency on teletext background
 
 signals:
     /// Send new position, new time and new length
@@ -114,10 +122,13 @@ signals:
     /// Play/pause status
     void statusChanged( int );
     void artChanged( QString );
-    /// Controll of fullscreen controller
-    void inputUnset();
     /// Teletext
     void teletextEnabled( bool );
+    void toggleTelexButtons();
+    void toggleTelexTransparency();
+    void setNewTelexPage( int );
+    /// Advanced buttons
+    void advControlsSetIcon();
 };
 
 class MainInputManager : public QObject
@@ -149,6 +160,7 @@ private:
     intf_thread_t           *p_intf;
     static MainInputManager *instance;
 public slots:
+    bool teletextState();
     void togglePlayPause();
     void stop();
     void next();