X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.h;h=962a7fedcb17b3fd7bb8a18709f6b9e9a8ab1924;hp=f73fbed55bef4bb598aaef113dcfc6343aa72007;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=294704d07de1fd6981362d85a26e4a83a6ef08fa

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index f73fbed55..962a7fedc 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,7 +26,7 @@ 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);
@@ -33,6 +34,7 @@ public:
 
 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 ();
@@ -44,16 +46,30 @@ 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;
-	Timecode<DCPTime>* _full_length;
-	Timecode<ContentTime>* _trim_start;
+	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;
+	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;
 };