X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.h;h=e0be2d74bf22dc5c5744bf6b97fee628a049f380;hb=4219d4b76c5cd5690b1f4fa0c248d93ced26d05a;hp=0767daa09aaa82ecd9c849dbe7052c18e1ea48e8;hpb=439953204388991b96fce215c62396a7b6d33acd;p=dcpomatic.git

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 0767daa09..e0be2d74b 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,13 +20,14 @@
 
 #include "content_sub_panel.h"
 #include "timecode.h"
+#include "suspender.h"
 
 class FilmViewer;
 
 class TimingPanel : public ContentSubPanel
 {
 public:
-	TimingPanel (ContentPanel *, FilmViewer* viewer);
+	TimingPanel (ContentPanel *, boost::weak_ptr<FilmViewer> viewer);
 
 	void film_changed (Film::Property);
 	void film_content_changed (int);
@@ -46,17 +47,32 @@ private:
 	void update_full_length ();
 	void update_play_length ();
 	void setup_sensitivity ();
+	void add_to_grid ();
 
-	FilmViewer* _viewer;
+	boost::weak_ptr<FilmViewer> _viewer;
 
-	Timecode<DCPTime>* _position;
+	wxStaticText* _h_label;
+	wxStaticText* _m_label;
+	wxStaticText* _s_label;
+	wxStaticText* _f_label;
+	wxStaticText* _colon[3];
+	wxStaticText* _tip;
+	wxStaticText* _position_label;
+	Timecode<dcpomatic::DCPTime>* _position;
 	wxButton* _move_to_start_of_reel;
-	Timecode<DCPTime>* _full_length;
-	Timecode<ContentTime>* _trim_start;
+	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;
+	wxStaticText* _trim_end_label;
+	Timecode<dcpomatic::ContentTime>* _trim_end;
+	wxStaticText* _play_length_label;
+	Timecode<dcpomatic::DCPTime>* _play_length;
+	wxStaticText* _video_frame_rate_label;
 	wxTextCtrl* _video_frame_rate;
 	wxButton* _set_video_frame_rate;
+
+	Suspender _film_content_changed_suspender;
 };