X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.h;h=f5c9893dea25b125268e85cfe3e8329307ba10fe;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hp=2b92c6307cabcfc4af19c26999a23baf110bbb0b;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 2b92c6307..f5c9893de 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,41 +20,54 @@
 
 #include "content_sub_panel.h"
 #include "timecode.h"
+#include "suspender.h"
 
 class FilmViewer;
 
 class TimingPanel : public ContentSubPanel
 {
 public:
-	TimingPanel (ContentPanel *, FilmViewer* viewer);
+	TimingPanel (ContentPanel *, std::weak_ptr<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 ();
+	void move_to_start_of_reel_clicked ();
 	void full_length_changed ();
 	void trim_start_changed ();
 	void trim_start_to_playhead_clicked ();
 	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 () override;
 
-	FilmViewer* _viewer;
+	std::weak_ptr<FilmViewer> _viewer;
 
-	Timecode<DCPTime>* _position;
-	Timecode<DCPTime>* _full_length;
-	Timecode<ContentTime>* _trim_start;
+	wxStaticText* _h_label;
+	wxStaticText* _m_label;
+	wxStaticText* _s_label;
+	wxStaticText* _f_label;
+	wxStaticText* _colon[3];
+	wxStaticText* _position_label;
+	Timecode<dcpomatic::DCPTime>* _position;
+	wxButton* _move_to_start_of_reel;
+	wxStaticText* _full_length_label;
+	Timecode<dcpomatic::DCPTime>* _full_length;
+	wxStaticText* _trim_start_label;
+	Timecode<dcpomatic::ContentTime>* _trim_start;
 	wxButton* _trim_start_to_playhead;
 	wxButton* _trim_end_to_playhead;
-	Timecode<ContentTime>* _trim_end;
-	Timecode<DCPTime>* _play_length;
-	wxTextCtrl* _video_frame_rate;
-	wxButton* _set_video_frame_rate;
+	wxStaticText* _trim_end_label;
+	Timecode<dcpomatic::ContentTime>* _trim_end;
+	wxStaticText* _play_length_label;
+	Timecode<dcpomatic::DCPTime>* _play_length;
+
+	Suspender _film_content_changed_suspender;
 };