Move _state_timer into VideoView.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 077d8a6a54c17dd146761ce4cccfb98a3a759b38..0699b12ae787ec4e1f1f42443b60bf438bf972c7 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -27,6 +27,7 @@
 #include "lib/config.h"
 #include "lib/player_text.h"
 #include "lib/timer.h"
+#include "lib/signaller.h"
 #include <RtAudio.h>
 #include <wx/wx.h>
 
@@ -42,7 +43,7 @@ class ClosedCaptionsDialog;
 /** @class FilmViewer
  *  @brief A wx widget to view a Film.
  */
-class FilmViewer
+class FilmViewer : public Signaller
 {
 public:
        FilmViewer (wxWindow *);
@@ -69,7 +70,7 @@ public:
        void seek_by (dcpomatic::DCPTime by, bool accurate);
        /** @return our `playhead' position; this may not lie exactly on a frame boundary */
        dcpomatic::DCPTime position () const {
-               return _video_position;
+               return _video_view->position();
        }
        dcpomatic::DCPTime one_video_frame () const;
 
@@ -77,6 +78,7 @@ public:
        bool stop ();
        void suspend ();
        void resume ();
+
        bool playing () const {
                return _playing;
        }
@@ -90,9 +92,7 @@ public:
 
        void slow_refresh ();
 
-       int dropped () const {
-               return _dropped;
-       }
+       int dropped () const;
 
        int audio_callback (void* out, unsigned int frames);
 
@@ -107,41 +107,37 @@ public:
        }
 #endif
 
-       StateTimer const & state_timer () const {
-               return _state_timer;
-       }
-
-       StateTimer& state_timer () {
-               return _state_timer;
-       }
-
        int gets () const {
                return _gets;
        }
 
-       /* Some accessors that VideoView classes need */
+       StateTimer const & state_timer () const {
+               return _video_view->state_timer ();
+       }
+
+       /* Some accessors and utility methods 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::shared_ptr<Butler> butler () const {
+               return _butler;
+       }
+       ClosedCaptionsDialog* closed_captions_dialog () const {
+               return _closed_captions_dialog;
+       }
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
-       boost::signals2::signal<void ()> PositionChanged;
        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;
 
@@ -149,18 +145,21 @@ 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_get ();
-       void display_player_video ();
+       void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);
        void recreate_butler ();
        void config_changed (Config::Property);
+       void film_length_change ();
 
        dcpomatic::DCPTime time () const;
+       boost::optional<dcpomatic::DCPTime> audio_time () const;
        dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
@@ -174,11 +173,6 @@ private:
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
-       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
-       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;
 
@@ -194,7 +188,6 @@ private:
        mutable boost::mutex _latency_history_mutex;
        int _latency_history_count;
 
-       int _dropped;
        boost::optional<int> _dcp_decode_reduction;
 
        ClosedCaptionsDialog* _closed_captions_dialog;
@@ -210,7 +203,6 @@ private:
        bool _background_image;
 #endif
 
-       StateTimer _state_timer;
        int _gets;
 
        /** true if an get() is required next time we are idle */