Remove swaroop variant.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 0699b12ae787ec4e1f1f42443b60bf438bf972c7..15d6bfaf5b2f648d50f56fe3ce371640e997d0a4 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,30 +90,21 @@ 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);
 
        void slow_refresh ();
 
+       dcpomatic::DCPTime time () const;
+       boost::optional<dcpomatic::DCPTime> audio_time () const;
+
        int dropped () const;
+       int errored () const;
+       int gets () const;
 
        int audio_callback (void* out, unsigned int frames);
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       void set_background_image (bool b) {
-               _background_image = b;
-               refresh_view ();
-       }
-
-       bool background_image () const {
-               return _background_image;
-       }
-#endif
-
-       int gets () const {
-               return _gets;
-       }
-
        StateTimer const & state_timer () const {
                return _video_view->state_timer ();
        }
@@ -122,6 +116,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;
        }
@@ -131,39 +128,38 @@ public:
        ClosedCaptionsDialog* closed_captions_dialog () const {
                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) */
        boost::signals2::signal<void ()> Finished;
-       void emit_finished ();
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
 
-       /* XXX_b: to remove */
-       friend class SimpleVideoView;
-       friend class GLVideoView;
-       friend class VideoView;
-
        void video_view_sized ();
        void calculate_sizes ();
        void player_change (ChangeType type, int, bool);
        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 ();
+       void ui_finished ();
 
-       dcpomatic::DCPTime time () const;
-       boost::optional<dcpomatic::DCPTime> audio_time () const;
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
-       void refresh_view ();
        bool quick_refresh ();
 
        boost::shared_ptr<Film> _film;
@@ -193,18 +189,12 @@ private:
        ClosedCaptionsDialog* _closed_captions_dialog;
 
        bool _outline_content;
-       Eyes _eyes;
+       boost::optional<dcpomatic::Rect<double> > _outline_subtitles;
        /** true to pad the viewer panel with black, false to use
            the normal window background colour.
        */
        bool _pad_black;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _background_image;
-#endif
-
-       int _gets;
-
        /** true if an get() is required next time we are idle */
        bool _idle_get;