Missing setup of SubtitleDecoder position causing #1271 and probably other things.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 50f7dd2cb2122e3d3446e5e0202dd8ac5b49e6c6..a41cb310e374ec6b7d5c1cbb7480926af72a4e5a 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -59,7 +59,8 @@ public:
        void set_dcp_decode_reduction (boost::optional<int> reduction);
        boost::optional<int> dcp_decode_reduction () const;
 
-       void refresh ();
+       void slow_refresh ();
+       bool quick_refresh ();
 
        int dropped () const {
                return _dropped;
@@ -72,7 +73,8 @@ public:
 private:
        void paint_panel ();
        void panel_sized (wxSizeEvent &);
-       void slider_moved (bool update_slider);
+       void slider_moved (bool page);
+       void slider_released ();
        void play_clicked ();
        void timer ();
        void calculate_sizes ();
@@ -81,10 +83,11 @@ private:
        void rewind_clicked (wxMouseEvent &);
        void back_clicked (wxMouseEvent &);
        void forward_clicked (wxMouseEvent &);
-       void player_changed (bool);
+       void player_changed (int, bool);
        void update_position_label ();
        void update_position_slider ();
        void get ();
+       void display_player_video ();
        void seek (DCPTime t, bool accurate);
        void refresh_panel ();
        void setup_sensitivity ();
@@ -121,8 +124,11 @@ private:
        wxToggleButton* _play_button;
        wxTimer _timer;
        bool _coalesce_player_changes;
-       bool _pending_player_change;
+       std::list<int> _pending_player_changes;
+       bool _slider_being_moved;
+       bool _was_running_before_slider;
 
+       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
        boost::shared_ptr<const Image> _frame;
        DCPTime _video_position;
        Position<int> _inter_position;
@@ -132,11 +138,6 @@ private:
        dcp::Size _out_size;
        /** Size of the panel that we have available */
        dcp::Size _panel_size;
-       /** true if the last call to Player::seek() was specified to be accurate;
-        *  this is used so that when re-fetching the current frame we
-        *  can get the same one that we got last time.
-        */
-       bool _last_seek_accurate;
 
        RtAudio _audio;
        int _audio_channels;