Add vlclua_dir_list_free to free list created by vlclua_dir_list and use it.

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index ce9e352539a69e8aeef0bbe05244177f4c176659..6d133f6cf32e0a850f9e3c3e016b7702cd756642 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -36,16 +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 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 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
 {
@@ -65,7 +67,7 @@ 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();
 
@@ -88,6 +90,7 @@ private:
     void UpdateNavigation();
     void UpdatePosition();
     void UpdateSPU();
+    void UpdateTeletext();
     void UpdateArt();
 
 public slots:
@@ -116,8 +119,6 @@ signals:
     /// Play/pause status
     void statusChanged( int );
     void artChanged( QString );
-    /// Controll of fullscreen controller
-    void inputUnset();
     /// Teletext
     void teletextEnabled( bool );
     void toggleTelexButtons();