Fix play button behaviour.

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

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 6825ef2c04185bb5186fc092672f694ebad77ca4..d080c79a5957dd08b8639f81ef6c34736d264db9 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -24,7 +24,7 @@
 
 #include "lib/film.h"
 #include "lib/config.h"
-#include "lib/player_caption.h"
+#include "lib/player_text.h"
 #include <RtAudio.h>
 #include <wx/wx.h>
 
@@ -40,12 +40,16 @@ class ClosedCaptionsDialog;
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
  */
-class FilmViewer : public wxPanel
+class FilmViewer
 {
 public:
-       FilmViewer (wxWindow *, bool outline_content = true, bool jump_to_selected = true);
+       FilmViewer (wxWindow *);
        ~FilmViewer ();
 
+       wxPanel* panel () const {
+               return _panel;
+       }
+
        void set_film (boost::shared_ptr<Film>);
        boost::shared_ptr<Film> film () const {
                return _film;
@@ -75,70 +79,51 @@ public:
                return _playing;
        }
 
-       void back_frame ();
-       void forward_frame ();
+       void move (DCPTime by);
+       DCPTime one_video_frame () const;
+       void seek (DCPTime t, bool accurate);
+       DCPTime video_position () const {
+               return _video_position;
+       }
+       void go_to (DCPTime t);
+       void set_outline_content (bool o);
+       void set_eyes (Eyes e);
 
        int audio_callback (void* out, unsigned int frames);
 
        void show_closed_captions ();
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
+       boost::signals2::signal<void ()> PositionChanged;
+       boost::signals2::signal<void ()> Started;
+       boost::signals2::signal<void ()> Stopped;
 
 private:
        void paint_panel ();
        void panel_sized (wxSizeEvent &);
-       void slider_moved (bool page);
-       void slider_released ();
-       void play_clicked ();
        void timer ();
        void calculate_sizes ();
        void check_play_state ();
-       void active_jobs_changed (boost::optional<std::string>);
-       void rewind_clicked (wxMouseEvent &);
-       void back_clicked (wxKeyboardState& s);
-       void forward_clicked (wxKeyboardState &);
-       void player_changed (int, bool);
-       void update_position_label ();
-       void update_position_slider ();
+       void player_change (ChangeType type, int, bool);
        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 (wxKeyboardState &);
+       void film_change (ChangeType, Film::Property);
        void timecode_clicked ();
-       void frame_number_clicked ();
-       void go_to (DCPTime t);
-       void jump_to_selected_clicked ();
        void recreate_butler ();
        void config_changed (Config::Property);
        DCPTime time () const;
+       DCPTime uncorrected_time () const;
        Frame average_latency () const;
-       DCPTime one_video_frame () const;
-       void caption (PlayerCaption caption, CaptionType type, DCPTimePeriod period);
+       void refresh_panel ();
 
        boost::shared_ptr<Film> _film;
        boost::shared_ptr<Player> _player;
 
-       wxSizer* _v_sizer;
        /** The area that we put our image in */
        wxPanel* _panel;
-       wxCheckBox* _outline_content;
-       wxChoice* _eye;
-       wxCheckBox* _jump_to_selected;
-       wxSlider* _slider;
-       wxButton* _rewind_button;
-       wxButton* _back_button;
-       wxButton* _forward_button;
-       wxStaticText* _frame_number;
-       wxStaticText* _timecode;
-       wxToggleButton* _play_button;
        wxTimer _timer;
        bool _coalesce_player_changes;
        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;
@@ -167,5 +152,8 @@ private:
 
        ClosedCaptionsDialog* _closed_captions_dialog;
 
+       bool _outline_content;
+       Eyes _eyes;
+
        boost::signals2::scoped_connection _config_changed_connection;
 };