Fix memory leak which also causes strange flickering in the audio

[dcpomatic.git] / src / wx / controls.h

diff --git a/src/wx/controls.h b/src/wx/controls.h
index dfa11e6d74ecc67e8526d9f4c8f43760bfe7d4c6..1d6273af68088172e9e9702ee1c496a1a5e9d4a5 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -24,8 +24,10 @@
 #include "lib/dcpomatic_time.h"
 #include "lib/types.h"
 #include "lib/film.h"
-#include "lib/spl.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
@@ -53,6 +55,11 @@ public:
 
        virtual void log (wxString) {}
        virtual void set_film (boost::shared_ptr<Film> film);
+
+       virtual void play () {};
+       virtual void stop () {};
+       void seek (int slider);
+
        boost::shared_ptr<Film> film () const;
        void back_frame ();
        void forward_frame ();
@@ -87,7 +94,7 @@ private:
        void image_changed (boost::weak_ptr<PlayerVideo>);
        void outline_content_changed ();
        void eye_changed ();
-       void position_changed ();
+       void update_position ();
        void film_change (ChangeType, Film::Property);
 
        typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
@@ -105,6 +112,8 @@ private:
 
        ClosedCaptionsDialog* _closed_captions_dialog;
 
+       wxTimer _timer;
+
        boost::signals2::scoped_connection _film_change_connection;
        boost::signals2::scoped_connection _config_changed_connection;
 };