qt4: fix a memleak.

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

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 35c1de9f040c7b1271f5903eb8f853293493546f..56f2c36373e9b6711be6ad1fb3ba471cc3660acb 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -22,14 +22,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _INPUT_MANAGER_H_
-#define _INPUT_MANAGER_H_
+#ifndef QVLC_INPUT_MANAGER_H_
+#define QVLC_INPUT_MANAGER_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <vlc_input.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
 
 #include "qt4.hpp"
 
@@ -48,15 +50,16 @@ enum {
     ItemTeletextChanged_Type,
     InterfaceVoutUpdate_Type,
     StatisticsUpdate_Type, /*10*/
+    InterfaceAoutUpdate_Type,
     MetaChanged_Type,
     NameChanged_Type,
     InfoChanged_Type,
     SynchroChanged_Type,
     CachingEvent_Type,
-/*    BookmarkChanged_Type,
+    BookmarksChanged_Type,
     RecordingEvent_Type,
     ProgramChanged_Type,
-    SignalChanged_Type, */
+/*    SignalChanged_Type, */
 
     FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
     FullscreenControlShow_Type,
@@ -96,6 +99,7 @@ public:
 
     bool hasAudio();
     bool hasVideo() { return hasInput() && b_video; }
+    void requestArtUpdate();
 
     QString getName() { return oldName; }
 
@@ -125,11 +129,13 @@ private:
     void UpdateArt();
     void UpdateInfo();
     void UpdateMeta();
+    void UpdateMeta(int);
     void UpdateVout();
+    void UpdateAout();
     void UpdateStats();
     void UpdateCaching();
-
-    void AtoBLoop( int );
+    void UpdateRecord();
+    void UpdateProgramEvent();
 
 public slots:
     void setInput( input_thread_t * ); ///< Our controlled input changed
@@ -138,8 +144,13 @@ public slots:
     void reverse();
     void slower();
     void faster();
+    void littlefaster();
+    void littleslower();
     void normalRate();
     void setRate( int );
+    /* Jumping */
+    void jumpFwd();
+    void jumpBwd();
     /* Menus */
     void sectionNext();
     void sectionPrev();
@@ -147,13 +158,13 @@ public slots:
     /* Teletext */
     void telexSetPage( int );          ///< Goto teletext page
     void telexSetTransparency( bool ); ///< Transparency on teletext background
-    void telexActivation( bool );      ///< Enable disable teletext buttons
     void activateTeletext( bool );     ///< Toggle buttons after click
     /* A to B Loop */
     void setAtoB();
 
 private slots:
     void togglePlayPause();
+    void AtoBLoop( float, int, int );
 
 signals:
     /// Send new position, new time and new length
@@ -167,9 +178,11 @@ signals:
     void statisticsUpdated( input_item_t* );
     void infoChanged( input_item_t* );
     void metaChanged( input_item_t* );
-    void artChanged( input_item_t* );
+    void metaChanged( int );
+    void artChanged( QString );
     /// Play/pause status
     void statusChanged( int );
+    void recordingStateChanged( bool );
     /// Teletext
     void teletextPossible( bool );
     void teletextActivated( bool );
@@ -179,8 +192,13 @@ signals:
     void AtoBchanged( bool, bool );
     /// Vout
     void voutChanged( bool );
+    void voutListChanged( vout_thread_t **pp_vout, int i_vout );
+    /// Other
     void synchroChanged();
+    void bookmarksChanged();
     void cachingChanged( float );
+    /// Program Event changes
+    void encryptionChanged( bool );
 };
 
 class MainInputManager : public QObject
@@ -195,15 +213,20 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
+        instance = NULL;
     }
-    virtual ~MainInputManager();
 
     input_thread_t *getInput() { return p_input; };
     InputManager *getIM() { return im; };
 
+    vout_thread_t* getVout();
+    aout_instance_t *getAout();
+
 private:
     MainInputManager( intf_thread_t * );
+    virtual ~MainInputManager();
+
     static MainInputManager *instance;
 
     void customEvent( QEvent * );
@@ -217,6 +240,7 @@ public slots:
     void stop();
     void next();
     void prev();
+    void activatePlayQuit( bool );
 
 signals:
     void inputChanged( input_thread_t * );