Fix video waveform view with GL backend.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 60cde60d00139b10fb6a6546995e1eca66b50196..a0edafe955e38912de638dc98f86ee3a36fb7f92 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,8 +28,11 @@
 #include "lib/player_text.h"
 #include "lib/timer.h"
 #include "lib/signaller.h"
+#include "lib/warnings.h"
 #include <RtAudio.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class wxToggleButton;
 class FFmpegPlayer;
@@ -87,6 +90,7 @@ public:
        void set_dcp_decode_reduction (boost::optional<int> reduction);
        boost::optional<int> dcp_decode_reduction () const;
        void set_outline_content (bool o);
+       void set_outline_subtitles (boost::optional<dcpomatic::Rect<double> >);
        void set_eyes (Eyes e);
        void set_pad_black (bool p);
 
@@ -96,6 +100,7 @@ public:
        boost::optional<dcpomatic::DCPTime> audio_time () const;
 
        int dropped () const;
+       int errored () const;
        int gets () const;
 
        int audio_callback (void* out, unsigned int frames);
@@ -122,6 +127,9 @@ public:
        bool outline_content () const {
                return _outline_content;
        }
+       boost::optional<dcpomatic::Rect<double> > outline_subtitles () const {
+               return _outline_subtitles;
+       }
        bool pad_black () const {
                return _pad_black;
        }
@@ -132,8 +140,13 @@ public:
                return _closed_captions_dialog;
        }
        void finished ();
+       void image_changed (boost::shared_ptr<PlayerVideo> video);
+
+       bool pending_idle_get () const {
+               return _idle_get;
+       }
 
-       boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+       boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
@@ -149,6 +162,7 @@ private:
        void idle_handler ();
        void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);
+       void content_change (ChangeType, int property);
        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();
@@ -186,6 +200,7 @@ private:
        ClosedCaptionsDialog* _closed_captions_dialog;
 
        bool _outline_content;
+       boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
        /** true to pad the viewer panel with black, false to use
            the normal window background colour.
        */