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

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 7e38d86b8..962a7fedc 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -21,12 +21,12 @@
 #include "content_sub_panel.h"
 #include "timecode.h"
 
-class ControlFilmViewer;
+class FilmViewer;
 
 class TimingPanel : public ContentSubPanel
 {
 public:
-	TimingPanel (ContentPanel *, ControlFilmViewer* viewer);
+	TimingPanel (ContentPanel *, boost::weak_ptr<FilmViewer> viewer);
 
 	void film_changed (Film::Property);
 	void film_content_changed (int);
@@ -48,7 +48,7 @@ private:
 	void setup_sensitivity ();
 	void add_to_grid ();
 
-	ControlFilmViewer* _viewer;
+	boost::weak_ptr<FilmViewer> _viewer;
 
 	wxStaticText* _h_label;
 	wxStaticText* _m_label;
@@ -57,18 +57,18 @@ private:
 	wxStaticText* _colon[3];
 	wxStaticText* _tip;
 	wxStaticText* _position_label;
-	Timecode<DCPTime>* _position;
+	Timecode<dcpomatic::DCPTime>* _position;
 	wxButton* _move_to_start_of_reel;
 	wxStaticText* _full_length_label;
-	Timecode<DCPTime>* _full_length;
+	Timecode<dcpomatic::DCPTime>* _full_length;
 	wxStaticText* _trim_start_label;
-	Timecode<ContentTime>* _trim_start;
+	Timecode<dcpomatic::ContentTime>* _trim_start;
 	wxButton* _trim_start_to_playhead;
 	wxButton* _trim_end_to_playhead;
 	wxStaticText* _trim_end_label;
-	Timecode<ContentTime>* _trim_end;
+	Timecode<dcpomatic::ContentTime>* _trim_end;
 	wxStaticText* _play_length_label;
-	Timecode<DCPTime>* _play_length;
+	Timecode<dcpomatic::DCPTime>* _play_length;
 	wxStaticText* _video_frame_rate_label;
 	wxTextCtrl* _video_frame_rate;
 	wxButton* _set_video_frame_rate;