Untested; allow viewing of subtitles or closed captions in the preview.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 50f7dd2cb2122e3d3446e5e0202dd8ac5b49e6c6..cb372391ad0306a16c4f614555af5b0e4b327891 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -55,16 +55,27 @@ public:
        }
 
        void set_position (DCPTime p);
+       void set_position (boost::shared_ptr<Content> content, ContentTime p);
        void set_coalesce_player_changes (bool c);
        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;
        }
 
+       void start ();
+       bool stop ();
+       bool playing () const {
+               return _playing;
+       }
+
+       void back_frame ();
+       void forward_frame ();
+
        int audio_callback (void* out, unsigned int frames);
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
@@ -72,24 +83,27 @@ 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 captions_changed ();
        void calculate_sizes ();
        void check_play_state ();
        void active_jobs_changed (boost::optional<std::string>);
        void rewind_clicked (wxMouseEvent &);
-       void back_clicked (wxMouseEvent &);
-       void forward_clicked (wxMouseEvent &);
-       void player_changed (bool);
+       void back_clicked (wxKeyboardState& s);
+       void forward_clicked (wxKeyboardState &);
+       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 ();
        void film_changed (Film::Property);
-       DCPTime nudge_amount (wxMouseEvent &);
+       DCPTime nudge_amount (wxKeyboardState &);
        void timecode_clicked ();
        void frame_number_clicked ();
        void go_to (DCPTime t);
@@ -97,8 +111,6 @@ private:
        void recreate_butler ();
        void config_changed (Config::Property);
        DCPTime time () const;
-       void start ();
-       bool stop ();
        Frame average_latency () const;
        DCPTime one_video_frame () const;
 
@@ -109,9 +121,9 @@ private:
        /** The area that we put our image in */
        wxPanel* _panel;
        wxCheckBox* _outline_content;
-       wxRadioButton* _left_eye;
-       wxRadioButton* _right_eye;
+       wxChoice* _eye;
        wxCheckBox* _jump_to_selected;
+       wxChoice* _captions;
        wxSlider* _slider;
        wxButton* _rewind_button;
        wxButton* _back_button;
@@ -121,8 +133,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 +147,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;