Same thing with inter_size.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index beb1a5d749aee4bbeea8ade5b8153eee72465858..8cacf80d3f050bfb79f83865e5e2f81d7d75028b 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 *);
@@ -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);
 
@@ -123,12 +123,6 @@ public:
        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;
        }
@@ -138,13 +132,13 @@ public:
        boost::shared_ptr<Butler> butler () const {
                return _butler;
        }
-       int time_until_next_frame () const;
 
        boost::signals2::signal<void (boost::weak_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;
 
@@ -163,8 +157,10 @@ private:
        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;
 
@@ -178,9 +174,6 @@ private:
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
-       Position<int> _inter_position;
-       dcp::Size _inter_size;
-
        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
 
@@ -196,7 +189,6 @@ private:
        mutable boost::mutex _latency_history_mutex;
        int _latency_history_count;
 
-       int _dropped;
        boost::optional<int> _dcp_decode_reduction;
 
        ClosedCaptionsDialog* _closed_captions_dialog;