X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.h;h=e300e4975cf32b698dca2a1b2b452b9d164070d2;hb=1420c529d7e196f96ddf9580efdc09fa01c55d58;hp=b84ea52be644030be6b852958ce3e1899f7d3cf8;hpb=c57e92b12c64d4ad1a7f23876a97471565f9a252;p=dcpomatic.git

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index b84ea52be..e300e4975 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,25 +17,42 @@
 
 */
 
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
+#include "timecode.h"
 
-class Timecode;
+class FilmViewer;
 
-class TimingPanel : public FilmEditorPanel
+class TimingPanel : public ContentSubPanel
 {
 public:
-	TimingPanel (FilmEditor *);
+	TimingPanel (ContentPanel *, FilmViewer* viewer);
 
-	void film_content_changed (boost::shared_ptr<Content>, int);
+	void film_changed (Film::Property);
+	void film_content_changed (int);
+	void content_selection_changed ();
 	
 private:
 	void position_changed ();
-	void length_changed ();
+	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 ();
+
+	FilmViewer* _viewer;
 	
-	Timecode* _position;
-	Timecode* _length;
-	Timecode* _trim_start;
-	Timecode* _trim_end;
+	Timecode<DCPTime>* _position;
+	Timecode<DCPTime>* _full_length;
+	Timecode<DCPTime>* _trim_start;
+	wxButton* _trim_start_to_playhead;
+	wxButton* _trim_end_to_playhead;
+	Timecode<DCPTime>* _trim_end;
+	Timecode<DCPTime>* _play_length;
+	wxTextCtrl* _video_frame_rate;
+	wxButton* _set_video_frame_rate;
 };