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 f7fb204f17ace81c0b76ea4f1bb7f9dfaf5df910..56f2c36373e9b6711be6ad1fb3ba471cc3660acb 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -22,8 +22,8 @@
  * 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"
@@ -58,8 +58,8 @@ enum {
     CachingEvent_Type,
     BookmarksChanged_Type,
     RecordingEvent_Type,
-/*    ProgramChanged_Type,
-    SignalChanged_Type, */
+    ProgramChanged_Type,
+/*    SignalChanged_Type, */
 
     FullscreenControlToggle_Type = QEvent::User + IMEventType + 20,
     FullscreenControlShow_Type,
@@ -135,8 +135,7 @@ private:
     void UpdateStats();
     void UpdateCaching();
     void UpdateRecord();
-
-    void AtoBLoop( int );
+    void UpdateProgramEvent();
 
 public slots:
     void setInput( input_thread_t * ); ///< Our controlled input changed
@@ -145,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();
@@ -160,6 +164,7 @@ public slots:
 
 private slots:
     void togglePlayPause();
+    void AtoBLoop( float, int, int );
 
 signals:
     /// Send new position, new time and new length
@@ -192,6 +197,7 @@ signals:
     void synchroChanged();
     void bookmarksChanged();
     void cachingChanged( float );
+    /// Program Event changes
     void encryptionChanged( bool );
 };
 
@@ -207,9 +213,9 @@ 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; };
@@ -219,6 +225,8 @@ public:
 
 private:
     MainInputManager( intf_thread_t * );
+    virtual ~MainInputManager();
+
     static MainInputManager *instance;
 
     void customEvent( QEvent * );
@@ -232,6 +240,7 @@ public slots:
     void stop();
     void next();
     void prev();
+    void activatePlayQuit( bool );
 
 signals:
     void inputChanged( input_thread_t * );