Fix up SimpleVideoView.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 97da5f59185e8c1b030b0abb2e683c866e8c4ced..76917f8078122d3bfe46b4dc9255e86c7d3a15f1 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -22,6 +22,7 @@
  *  @brief FilmViewer class.
  */
 
+#include "video_view.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/player_text.h"
@@ -47,9 +48,9 @@ public:
        FilmViewer (wxWindow *);
        ~FilmViewer ();
 
-       /** @return the panel showing the film's video */
-       wxPanel* panel () const {
-               return _panel;
+       /** @return the window showing the film's video */
+       wxWindow* panel () const {
+               return _video_view->get();
        }
 
        void show_closed_captions ();
@@ -59,14 +60,14 @@ public:
                return _film;
        }
 
-       void seek (DCPTime t, bool accurate);
-       void seek (boost::shared_ptr<Content> content, ContentTime p, bool accurate);
-       void seek_by (DCPTime by, bool accurate);
+       void seek (dcpomatic::DCPTime t, bool accurate);
+       void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+       void seek_by (dcpomatic::DCPTime by, bool accurate);
        /** @return our `playhead' position; this may not lie exactly on a frame boundary */
-       DCPTime position () const {
+       dcpomatic::DCPTime position () const {
                return _video_position;
        }
-       DCPTime one_video_frame () const;
+       dcpomatic::DCPTime one_video_frame () const;
 
        void start ();
        bool stop ();
@@ -104,18 +105,34 @@ public:
                return _gets;
        }
 
+       /* Some accessors that VideoView classes need */
+       dcp::Size out_size () const {
+               return _out_size;
+       }
+       dcp::Size inter_size () const {
+               return _inter_size;
+       }
+       Position<int> inter_position () const {
+               return _inter_position;
+       }
+       bool outline_content () const {
+               return _outline_content;
+       }
+       bool pad_black () const {
+               return _pad_black;
+       }
+
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void ()> PositionChanged;
-       boost::signals2::signal<void (DCPTime)> Started;
-       boost::signals2::signal<void (DCPTime)> Stopped;
+       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;
 
        boost::signals2::signal<bool ()> PlaybackPermitted;
 
 private:
-       void paint_panel ();
-       void panel_sized (wxSizeEvent &);
+       void video_view_sized ();
        void timer ();
        void calculate_sizes ();
        void player_change (ChangeType type, int, bool);
@@ -126,32 +143,29 @@ private:
        void config_changed (Config::Property);
        bool maybe_draw_background_image (wxPaintDC& dc);
 
-       DCPTime time () const;
-       DCPTime uncorrected_time () const;
+       dcpomatic::DCPTime time () const;
+       dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
-       void refresh_panel ();
+       void refresh_view ();
        bool quick_refresh ();
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
 
-       /** The area that we put our image in */
-       wxPanel* _panel;
+       VideoView* _video_view;
        wxTimer _timer;
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
-       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
        boost::shared_ptr<const Image> _frame;
-       DCPTime _video_position;
+       dcpomatic::DCPTime _video_position;
        Position<int> _inter_position;
        dcp::Size _inter_size;
 
        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
-       /** Size of the panel that we have available */
-       dcp::Size _panel_size;
 
        RtAudio _audio;
        int _audio_channels;