X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Finput_manager.hpp;h=6d133f6cf32e0a850f9e3c3e016b7702cd756642;hb=03967e7ffa33848362d39bccd0af4b32b8c4e7f0;hp=b3ae1dea3b48774afda11206e47a29a1d0f4f861;hpb=12f8c376ddf570554a982e38f5f927f322962400;p=vlc

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index b3ae1dea3b..6d133f6cf3 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 
 #include "qt4.hpp"
@@ -36,12 +36,18 @@
 #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 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 FullscreenControlShow_Type = QEvent::User + IMEventType + 10;
+static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 11;
+static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 12;
 
 class IMEvent : public QEvent
 {
@@ -61,10 +67,9 @@ public:
     virtual ~InputManager();
 
     void delInput();
-    bool hasInput() { return p_input && !p_input->b_dead && !p_input->b_die; }
-    bool hasAudio() { return b_has_audio; }
-    bool hasVideo() { return b_has_video; }
-    bool b_has_audio, b_has_video, b_had_audio, b_had_video, b_has_subs;
+    bool hasInput() { return p_input && !p_input->b_dead && vlc_object_alive (p_input); }
+    bool hasAudio();
+    bool hasVideo();
 
 private:
     intf_thread_t  *p_intf;
@@ -74,6 +79,7 @@ private:
     QString         old_name;
     QString         artUrl;
     int             i_rate;
+    bool            b_transparentTelextext;
 
     void customEvent( QEvent * );
     void addCallbacks();
@@ -83,7 +89,8 @@ private:
     void UpdateStatus();
     void UpdateNavigation();
     void UpdatePosition();
-    void UpdateTracks();
+    void UpdateSPU();
+    void UpdateTeletext();
     void UpdateArt();
 
 public slots:
@@ -97,11 +104,10 @@ public slots:
     void sectionNext();
     void sectionPrev();
     void sectionMenu();
-#ifdef ZVBI_COMPILED
-    void telexGotoPage( int );
-    void telexToggle( bool );
-    void telexSetTransparency( bool );
-#endif
+    void telexGotoPage( int ); ///< Goto teletext page
+    void telexToggle( bool );  ///< Enable disable teletext buttons
+    void telexToggleButtons(); ///< Toggle buttons after click
+    void telexSetTransparency(); ///< Set transparency on teletext background
 
 signals:
     /// Send new position, new time and new length
@@ -113,9 +119,11 @@ signals:
     /// Play/pause status
     void statusChanged( int );
     void artChanged( QString );
-#ifdef ZVBI_COMPILED
+    /// Teletext
     void teletextEnabled( bool );
-#endif
+    void toggleTelexButtons();
+    void toggleTelexTransparency();
+    void setNewTelexPage( int );
 };
 
 class MainInputManager : public QObject
@@ -147,6 +155,7 @@ private:
     intf_thread_t           *p_intf;
     static MainInputManager *instance;
 public slots:
+    bool teletextState();
     void togglePlayPause();
     void stop();
     void next();