X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.h;h=c11d6e8e384730e52fb0261caff6252314714bf3;hb=981100bbff6883ff024b41d4b62e00b2ab8caec4;hp=ba7c46fcc50a7ff724c6df6768cd09360b3bbcc0;hpb=92f024ea58c7279b8096e5e9f60f9cb2613e8a91;p=dcpomatic.git diff --git a/src/wx/controls.h b/src/wx/controls.h index ba7c46fcc..c11d6e8e3 100644 --- a/src/wx/controls.h +++ b/src/wx/controls.h @@ -18,10 +18,12 @@ */ +#ifndef DCPOMATIC_CONTROLS_H +#define DCPOMATIC_CONTROLS_H + #include "lib/dcpomatic_time.h" #include "lib/types.h" #include "lib/film.h" -#include "lib/spl_entry.h" #include #include #include @@ -33,6 +35,7 @@ class Content; class PlayerVideo; class wxToggleButton; class wxListCtrl; +class ContentView; namespace dcp { class CPL; @@ -47,16 +50,32 @@ public: bool editor_controls = true ); + virtual void log (wxString) {} + virtual void set_film (boost::shared_ptr film); +#ifdef DCPOMATIC_PLAYER_STRESS_TEST + virtual void play () {}; + virtual void stop () {}; + void seek (int slider); +#endif boost::shared_ptr film () const; void back_frame (); void forward_frame (); - void show_extended_player_controls (bool s); - void log (wxString s); +protected: + virtual void started (); + virtual void stopped (); + virtual void setup_sensitivity (); + virtual void config_changed (int property); - boost::signals2::signal)> SPLChanged; + wxSizer* _v_sizer; + wxBoxSizer* _button_sizer; + boost::shared_ptr _film; + wxSlider* _slider; + boost::shared_ptr _viewer; + boost::optional _active_job; private: + void update_position_label (); void update_position_slider (); void rewind_clicked (wxMouseEvent &); @@ -64,74 +83,36 @@ private: void forward_clicked (wxKeyboardState &); void slider_moved (bool page); void slider_released (); - void play_clicked (); void frame_number_clicked (); void jump_to_selected_clicked (); - void setup_sensitivity (); void timecode_clicked (); -#ifndef DCPOMATIC_PLAYER_SWAROOP - void check_play_state (); -#endif void active_jobs_changed (boost::optional); - DCPTime nudge_amount (wxKeyboardState& ev); + dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev); void image_changed (boost::weak_ptr); - void film_change (ChangeType type, Film::Property p); void outline_content_changed (); void eye_changed (); - void position_changed (); - void started (); - void stopped (); - void film_changed (); - void update_dcp_directory (); - void dcp_directory_changed (); - void config_changed (int property); + void update_position (); + void film_change (ChangeType, Film::Property); typedef std::pair, boost::filesystem::path> CPL; - boost::optional selected_cpl () const; -#ifdef DCPOMATIC_VARIANT_SWAROOP - void pause_clicked (); - void stop_clicked (); -#endif - void add_clicked (); - void add_cpl_to_list (boost::shared_ptr cpl, wxListCtrl* list); - - boost::shared_ptr _film; - boost::shared_ptr _viewer; - - wxSizer* _v_sizer; bool _slider_being_moved; - bool _was_running_before_slider; wxCheckBox* _outline_content; wxChoice* _eye; wxCheckBox* _jump_to_selected; - wxListCtrl* _cpl; - wxListCtrl* _spl_view; - wxTextCtrl* _log; - wxButton* _add_button; - std::vector _cpls; - wxSlider* _slider; wxButton* _rewind_button; wxButton* _back_button; wxButton* _forward_button; wxStaticText* _frame_number; wxStaticText* _timecode; -#ifdef DCPOMATIC_VARIANT_SWAROOP - wxButton* _play_button; - wxButton* _pause_button; - wxButton* _stop_button; -#else - wxToggleButton* _play_button; -#endif - boost::optional _active_job; - std::list _spl; ClosedCaptionsDialog* _closed_captions_dialog; -#ifdef DCPOMATIC_VARIANT_SWAROOP - boost::optional _current_kind; -#endif + wxTimer _timer; + boost::signals2::scoped_connection _film_change_connection; boost::signals2::scoped_connection _config_changed_connection; }; + +#endif