Put Time types in dcpomatic namespace.

37 files changed, 64 insertions, 41 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f4de9cd1a..9b3a93769 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -42,6 +42,7 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** @param parent Parent window.
  *  @param film Film we are using.
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 38f474afd..e866aca3f 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -35,7 +35,7 @@ public:
 
 	bool Show (bool show = true);
 
-	void set_cursor (boost::optional<DCPTime> time, boost::optional<float> db);
+	void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
 
 private:
 	void film_change (ChangeType, int);
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 079f69cdc..3da7a50ff 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -37,6 +37,7 @@ using std::map;
 using boost::bind;
 using boost::optional;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 int const AudioPlot::_minimum = -70;
 int const AudioPlot::_cursor_size = 8;
diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 85306a58d..edb444a2a 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -41,7 +41,7 @@ public:
 
 	wxColour colour (int n) const;
 
-	boost::signals2::signal<void (boost::optional<DCPTime>, boost::optional<float>)> Cursor;
+	boost::signals2::signal<void (boost::optional<dcpomatic::DCPTime>, boost::optional<float>)> Cursor;
 
 	static const int max_smoothing;
 
@@ -52,14 +52,14 @@ private:
 			: db(0)
 		{}
 
-		Point (wxPoint draw_, DCPTime time_, float db_)
+		Point (wxPoint draw_, dcpomatic::DCPTime time_, float db_)
 			: draw(draw_)
 			, time(time_)
 			, db(db_)
 		{}
 
 		wxPoint draw;
-		DCPTime time;
+		dcpomatic::DCPTime time;
 		float db;
 	};
 
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 44e6b8da1..061262cdd 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -35,6 +35,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
 	: wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 4b407fa5a..fb4e9d59b 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -31,7 +31,7 @@ class ClosedCaptionsDialog : public wxDialog
 public:
 	explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
-	void update (DCPTime);
+	void update (dcpomatic::DCPTime);
 	void clear ();
 	void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
 
@@ -47,5 +47,5 @@ private:
 	std::vector<wxString> _lines;
 	std::vector<DCPTextTrack> _tracks;
 	boost::weak_ptr<Butler> _butler;
-	DCPTime _last_update;
+	dcpomatic::DCPTime _last_update;
 };
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 82caaf1ff..72ef0e9eb 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -61,6 +61,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 class LimitedSplitter : public wxSplitterWindow
 {
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 4db00fb54..d4ef39cb9 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -39,6 +39,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 ContentView::ContentView (wxWindow* parent)
 	: wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 473ad8cb3..7cd31634d 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -52,6 +52,7 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
 	: wxPanel (parent)
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 7ffe0c4ea..88d21defb 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -83,7 +83,7 @@ private:
 	void jump_to_selected_clicked ();
 	void timecode_clicked ();
 	void active_jobs_changed (boost::optional<std::string>);
-	DCPTime nudge_amount (wxKeyboardState& ev);
+	dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev);
 	void image_changed (boost::weak_ptr<PlayerVideo>);
 	void outline_content_changed ();
 	void eye_changed ();
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a803eeda1..48fbf9fdc 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -67,6 +67,7 @@ using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
 using boost::optional;
 using dcp::Size;
+using namespace dcpomatic;
 
 static
 int
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 97da5f591..0222d31c9 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -59,14 +59,14 @@ public:
 		return _film;
 	}
 
-	void seek (DCPTime t, bool accurate);
-	void seek (boost::shared_ptr<Content> content, ContentTime p, bool accurate);
-	void seek_by (DCPTime by, bool accurate);
+	void seek (dcpomatic::DCPTime t, bool accurate);
+	void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+	void seek_by (dcpomatic::DCPTime by, bool accurate);
 	/** @return our `playhead' position; this may not lie exactly on a frame boundary */
-	DCPTime position () const {
+	dcpomatic::DCPTime position () const {
 		return _video_position;
 	}
-	DCPTime one_video_frame () const;
+	dcpomatic::DCPTime one_video_frame () const;
 
 	void start ();
 	bool stop ();
@@ -106,8 +106,8 @@ public:
 
 	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
 	boost::signals2::signal<void ()> PositionChanged;
-	boost::signals2::signal<void (DCPTime)> Started;
-	boost::signals2::signal<void (DCPTime)> Stopped;
+	boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
+	boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
 	/** While playing back we reached the end of the film (emitted from GUI thread) */
 	boost::signals2::signal<void ()> Finished;
 
@@ -126,8 +126,8 @@ private:
 	void config_changed (Config::Property);
 	bool maybe_draw_background_image (wxPaintDC& dc);
 
-	DCPTime time () const;
-	DCPTime uncorrected_time () const;
+	dcpomatic::DCPTime time () const;
+	dcpomatic::DCPTime uncorrected_time () const;
 	Frame average_latency () const;
 
 	void refresh_panel ();
@@ -142,9 +142,9 @@ private:
 	bool _coalesce_player_changes;
 	std::list<int> _pending_player_changes;
 
-	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
+	std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
 	boost::shared_ptr<const Image> _frame;
-	DCPTime _video_position;
+	dcpomatic::DCPTime _video_position;
 	Position<int> _inter_position;
 	dcp::Size _inter_size;
 
diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 46e8e6d09..dba4c0c0e 100644
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -36,6 +36,7 @@ using boost::bind;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+using dcpomatic::DCPTime;
 
 class Marker
 {
@@ -100,7 +101,7 @@ private:
 	weak_ptr<FilmViewer> viewer;
 	dcp::Marker type;
 	CheckBox* checkbox;
-	Timecode<DCPTime>* timecode;
+	Timecode<dcpomatic::DCPTime>* timecode;
 	Button* set_button;
 };
 
diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc
index cb3db90cc..266f44264 100644
--- a/src/wx/move_to_dialog.cc
+++ b/src/wx/move_to_dialog.cc
@@ -26,6 +26,7 @@
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 MoveToDialog::MoveToDialog (wxWindow* parent, optional<DCPTime> position, shared_ptr<const Film> film)
 	: TableDialog (parent, _("Move content"), 2, 0, true)
diff --git a/src/wx/move_to_dialog.h b/src/wx/move_to_dialog.h
index 4d8d991f5..3c6f3d064 100644
--- a/src/wx/move_to_dialog.h
+++ b/src/wx/move_to_dialog.h
@@ -29,9 +29,9 @@ class wxSpinCtrl;
 class MoveToDialog : public TableDialog
 {
 public:
-	MoveToDialog (wxWindow* parent, boost::optional<DCPTime> position, boost::shared_ptr<const Film> film);
+	MoveToDialog (wxWindow* parent, boost::optional<dcpomatic::DCPTime> position, boost::shared_ptr<const Film> film);
 
-	DCPTime position () const;
+	dcpomatic::DCPTime position () const;
 
 private:
 	boost::weak_ptr<const Film> _film;
diff --git a/src/wx/playhead_to_frame_dialog.cc b/src/wx/playhead_to_frame_dialog.cc
index 1ae049d26..4c8bc1cc6 100644
--- a/src/wx/playhead_to_frame_dialog.cc
+++ b/src/wx/playhead_to_frame_dialog.cc
@@ -22,6 +22,7 @@
 #include <dcp/locale_convert.h>
 
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 PlayheadToFrameDialog::PlayheadToFrameDialog (wxWindow* parent, int fps)
 	: TableDialog (parent, _("Go to frame"), 2, 1, true)
diff --git a/src/wx/playhead_to_frame_dialog.h b/src/wx/playhead_to_frame_dialog.h
index b6a902a55..ab3898dea 100644
--- a/src/wx/playhead_to_frame_dialog.h
+++ b/src/wx/playhead_to_frame_dialog.h
@@ -26,7 +26,7 @@ class PlayheadToFrameDialog : public TableDialog
 public:
 	PlayheadToFrameDialog (wxWindow* parent, int fps);
 
-	DCPTime get () const;
+	dcpomatic::DCPTime get () const;
 
 private:
 	wxTextCtrl* _frame;
diff --git a/src/wx/playhead_to_timecode_dialog.cc b/src/wx/playhead_to_timecode_dialog.cc
index a691aa64e..c622111db 100644
--- a/src/wx/playhead_to_timecode_dialog.cc
+++ b/src/wx/playhead_to_timecode_dialog.cc
@@ -20,6 +20,8 @@
 
 #include "playhead_to_timecode_dialog.h"
 
+using namespace dcpomatic;
+
 PlayheadToTimecodeDialog::PlayheadToTimecodeDialog (wxWindow* parent, int fps)
 	: TableDialog (parent, _("Go to timecode"), 2, 1, true)
 	, _fps (fps)
diff --git a/src/wx/playhead_to_timecode_dialog.h b/src/wx/playhead_to_timecode_dialog.h
index adce87434..226978582 100644
--- a/src/wx/playhead_to_timecode_dialog.h
+++ b/src/wx/playhead_to_timecode_dialog.h
@@ -26,9 +26,9 @@ class PlayheadToTimecodeDialog : public TableDialog
 public:
 	PlayheadToTimecodeDialog (wxWindow* parent, int fps);
 
-	DCPTime get () const;
+	dcpomatic::DCPTime get () const;
 
 private:
-	Timecode<DCPTime>* _timecode;
+	Timecode<dcpomatic::DCPTime>* _timecode;
 	int _fps;
 };
diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index ad4c03850..76e8d8b16 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -40,6 +40,7 @@ using boost::shared_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 int const SubtitleAppearanceDialog::NONE = 0;
 int const SubtitleAppearanceDialog::OUTLINE = 1;
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 0b3c66132..6c7e46817 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -58,9 +58,9 @@ private:
 	wxCheckBox* _force_effect_colour;
 	wxColourPickerCtrl* _effect_colour;
 	wxCheckBox* _force_fade_in;
-	Timecode<ContentTime>* _fade_in;
+	Timecode<dcpomatic::ContentTime>* _fade_in;
 	wxCheckBox* _force_fade_out;
-	Timecode<ContentTime>* _fade_out;
+	Timecode<dcpomatic::ContentTime>* _fade_out;
 	wxSpinCtrl* _outline_width;
 	wxGridBagSizer* _table;
 	std::map<RGBA, RGBAColourPicker*> _pickers;
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 33db37bab..d557d09e9 100644
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -41,6 +41,7 @@ using std::sort;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewer)
 	: Controls (parent, viewer, false)
diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 9b591b191..271e02d41 100644
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -35,6 +35,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 TextView::TextView (
 	wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer
diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 1fe07a999..6ce22dc79 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -42,14 +42,14 @@ public:
 
 private:
 	void data_start (ContentStringText cts);
-	void data_stop (ContentTime time);
+	void data_stop (dcpomatic::ContentTime time);
 	void subtitle_selected (wxListEvent &);
 
 	wxListCtrl* _list;
 	int _subs;
 	boost::optional<FrameRateChange> _frc;
 	boost::optional<int> _last_count;
-	std::vector<ContentTime> _start_times;
+	std::vector<dcpomatic::ContentTime> _start_times;
 	boost::weak_ptr<Content> _content;
 	boost::weak_ptr<FilmViewer> _film_viewer;
 };
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index de5f05ae7..2c510efb5 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -54,6 +54,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
 
 /* 3 hours in 640 pixels */
 double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index a7f345863..84cb870f2 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -107,7 +107,7 @@ private:
 	boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
 	TimelineContentViewList selected_views () const;
 	ContentList selected_content () const;
-	void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
+	void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
 
 	wxScrolledCanvas* _labels_canvas;
 	wxScrolledCanvas* _main_canvas;
@@ -123,12 +123,12 @@ private:
 	wxPoint _down_point;
 	boost::optional<wxPoint> _zoom_point;
 	boost::shared_ptr<TimelineContentView> _down_view;
-	DCPTime _down_view_position;
+	dcpomatic::DCPTime _down_view_position;
 	bool _first_move;
 	ContentMenu _menu;
 	bool _snap;
-	std::list<DCPTime> _start_snaps;
-	std::list<DCPTime> _end_snaps;
+	std::list<dcpomatic::DCPTime> _start_snaps;
+	std::list<dcpomatic::DCPTime> _end_snaps;
 	Tool _tool;
 	int _x_scroll_rate;
 	int _y_scroll_rate;
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index a55526c88..6902a11d6 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -27,6 +27,7 @@
 
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
 	: TimelineView (tl)
diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index f09a52a53..fa89c60a7 100644
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -26,6 +26,7 @@
 
 using std::min;
 using std::list;
+using namespace dcpomatic;
 
 TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
 	: TimelineView (tl)
diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index a31ed5ced..e9de1b542 100644
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -26,6 +26,7 @@
 
 using std::list;
 using std::cout;
+using namespace dcpomatic;
 
 TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
 	: TimelineView (tl)
diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc
index bb6ab6034..fb23fa7b1 100644
--- a/src/wx/timeline_view.cc
+++ b/src/wx/timeline_view.cc
@@ -22,6 +22,7 @@
 #include "timeline.h"
 
 using std::list;
+using namespace dcpomatic;
 
 /** @class TimelineView
  *  @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index f0ded7bce..d94e10124 100644
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -45,7 +45,7 @@ public:
 protected:
 	virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int> > overlaps) = 0;
 
-	int time_x (DCPTime t) const;
+	int time_x (dcpomatic::DCPTime t) const;
 
 	Timeline& _timeline;
 
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f10815ca4..06d655b6b 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -48,6 +48,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
 	/* horrid hack for apparent lack of context support with wxWidgets i18n code */
diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 65d8aabc9..962a7fedc 100644
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -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;
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 6615215d5..9c044e188 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -51,6 +51,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
 
 static VideoContentScale
 index_to_scale (int n)
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 795a52a78..8e9a77cab 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -70,9 +70,9 @@ private:
 	wxStaticText* _bottom_crop_label;
 	ContentSpinCtrl<VideoContent>* _bottom_crop;
 	wxStaticText* _fade_in_label;
-	Timecode<ContentTime>* _fade_in;
+	Timecode<dcpomatic::ContentTime>* _fade_in;
 	wxStaticText* _fade_out_label;
-	Timecode<ContentTime>* _fade_out;
+	Timecode<dcpomatic::ContentTime>* _fade_out;
 	wxStaticText* _scale_to_label;
 	ContentChoice<VideoContent, VideoContentScale>* _scale;
 	wxStaticText* _description;
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 1a537c087..d2f463b73 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -44,6 +44,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 wxStaticText *
 #ifdef __WXOSX__
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 1b3c4a2ae..400493f18 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -84,7 +84,7 @@ extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
 extern wxString context_translation (wxString);
 extern std::string string_client_data (wxClientData* o);
-extern wxString time_to_timecode (DCPTime t, double fps);
+extern wxString time_to_timecode (dcpomatic::DCPTime t, double fps);
 extern void setup_audio_channels_choice (wxChoice* choice, int minimum);
 extern wxSplashScreen* maybe_show_splash ();
 extern double calculate_mark_interval (double start);