X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.h;h=1edaeb27192b18da2f4195b9639676ab878b170b;hb=449f383f13e5755c523db11f9adef53b58391025;hp=e0be2d74bf22dc5c5744bf6b97fee628a049f380;hpb=746aa7337ac2d51a4fa09039c1d5d7717cc880fa;p=dcpomatic.git diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h index e0be2d74b..1edaeb271 100644 --- a/src/wx/timing_panel.h +++ b/src/wx/timing_panel.h @@ -27,11 +27,12 @@ class FilmViewer; class TimingPanel : public ContentSubPanel { public: - TimingPanel (ContentPanel *, boost::weak_ptr viewer); + TimingPanel(ContentPanel *, FilmViewer& viewer); - void film_changed (Film::Property); - void film_content_changed (int); - void content_selection_changed (); + void create () override; + void film_changed (Film::Property) override; + void film_content_changed (int) override; + void content_selection_changed () override; private: void position_changed (); @@ -42,21 +43,18 @@ private: void trim_end_changed (); void trim_end_to_playhead_clicked (); void play_length_changed (); - void video_frame_rate_changed (); - void set_video_frame_rate (); void update_full_length (); void update_play_length (); void setup_sensitivity (); - void add_to_grid (); + void add_to_grid () override; - boost::weak_ptr _viewer; + FilmViewer& _viewer; wxStaticText* _h_label; wxStaticText* _m_label; wxStaticText* _s_label; wxStaticText* _f_label; wxStaticText* _colon[3]; - wxStaticText* _tip; wxStaticText* _position_label; Timecode* _position; wxButton* _move_to_start_of_reel; @@ -70,9 +68,6 @@ private: Timecode* _trim_end; wxStaticText* _play_length_label; Timecode* _play_length; - wxStaticText* _video_frame_rate_label; - wxTextCtrl* _video_frame_rate; - wxButton* _set_video_frame_rate; Suspender _film_content_changed_suspender; };