Disable crashy FS controller by default

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index e7c371b425724f20cf49de07c865f44505a081e0..6d133f6cf32e0a850f9e3c3e016b7702cd756642 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -24,22 +24,30 @@
 #ifndef _INPUT_MANAGER_H_
 #define _INPUT_MANAGER_H_
 
-#ifdef HAVE_CONFIG_H 
-# include "config.h" 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 
+#include "qt4.hpp"
+
 #include <QObject>
 #include <QEvent>
 
-static int const PositionUpdate_Type = QEvent::User + 6;
-static int const ItemChanged_Type = QEvent::User + 7;
-static int const ItemRateChanged_Type = QEvent::User + 8;
-static int const ItemTitleChanged_Type = QEvent::User + 9;
-static int const ItemStateChanged_Type = QEvent::User + 10;
-static int const VolumeChanged_Type = QEvent::User + 11;
+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
 {
@@ -59,30 +67,36 @@ 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;
+    bool hasInput() { return p_input && !p_input->b_dead && vlc_object_alive (p_input); }
+    bool hasAudio();
+    bool hasVideo();
+
 private:
+    intf_thread_t  *p_intf;
+    input_thread_t *p_input;
+    int             i_input_id;
+    int             i_old_playing_status;
+    QString         old_name;
+    QString         artUrl;
+    int             i_rate;
+    bool            b_transparentTelextext;
+
     void customEvent( QEvent * );
     void addCallbacks();
     void delCallbacks();
     void UpdateRate();
     void UpdateMeta();
     void UpdateStatus();
-    void UpdateTitle();
+    void UpdateNavigation();
     void UpdatePosition();
+    void UpdateSPU();
+    void UpdateTeletext();
     void UpdateArt();
-    intf_thread_t  *p_intf;
-    input_thread_t *p_input;
-    int             i_old_playing_status;
-    QString         old_name;
-    QString         artUrl;
-    int             i_rate;
+
 public slots:
-    void togglePlayPause();
     void setInput( input_thread_t * ); ///< Our controlled input changed
     void sliderUpdate( float ); ///< User dragged the slider. We get new pos
+    void togglePlayPause();
     void slower();
     void faster();
     void normalRate();
@@ -90,11 +104,11 @@ 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
     void positionUpdated( float , int, int );
@@ -102,12 +116,14 @@ signals:
     void nameChanged( QString );
     /// Used to signal whether we should show navigation buttons
     void navigationChanged( int );
-#ifdef ZVBI_COMPILED
-    void teletextEnabled( bool );
-#endif
     /// Play/pause status
     void statusChanged( int );
     void artChanged( QString );
+    /// Teletext
+    void teletextEnabled( bool );
+    void toggleTelexButtons();
+    void toggleTelexTransparency();
+    void setNewTelexPage( int );
 };
 
 class MainInputManager : public QObject
@@ -125,24 +141,25 @@ public:
         if( instance ) delete instance;
     }
     virtual ~MainInputManager();
+
     input_thread_t *getInput() { return p_input; };
     InputManager *getIM() { return im; };
 
 private:
-    void customEvent( QEvent * );
     MainInputManager( intf_thread_t * );
+    void customEvent( QEvent * );
 
     InputManager            *im;
-    intf_thread_t           *p_intf;
     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();
-private slots:
-    //void updateInput();
 signals:
     void inputChanged( input_thread_t * );
     void volumeChanged();