Take Film pointer out of Content.

15 files changed, 75 insertions, 64 deletions

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index e1f7c15a6..48540077e 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -156,7 +156,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
 
 	if (content) {
 		_playlist.reset (new Playlist ());
-		const_pointer_cast<Playlist> (_playlist)->add (content);
+		const_pointer_cast<Playlist>(_playlist)->add(film, content);
 	} else {
 		_playlist = film->playlist ();
 	}
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 954d1676d..38504eacf 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -266,7 +266,7 @@ AudioPanel::setup_description ()
 		return;
 	}
 
-	checked_set (_description, ac.front()->audio->processing_description ());
+	checked_set (_description, ac.front()->audio->processing_description(_parent->film()));
 }
 
 void
@@ -304,7 +304,7 @@ AudioPanel::setup_sensitivity ()
 	}
 
 	string why_not;
-	bool const can_reference = dcp && dcp->can_reference_audio (why_not);
+	bool const can_reference = dcp && dcp->can_reference_audio (_parent->film(), why_not);
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
 	if (_reference->GetValue ()) {
@@ -353,7 +353,7 @@ AudioPanel::setup_peak ()
 		_peak->SetLabel (wxT (""));
 	} else {
 		shared_ptr<Playlist> playlist (new Playlist);
-		playlist->add (sel.front ());
+		playlist->add (_parent->film(), sel.front());
 		try {
 			shared_ptr<AudioAnalysis> analysis (new AudioAnalysis (_parent->film()->audio_analysis_path (playlist)));
 			peak_dB = 20 * log10 (analysis->overall_sample_peak().first.peak) + analysis->gain_correction (playlist);
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 6a5ca8be4..017d2c659 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -209,7 +209,7 @@ ContentMenu::join ()
 	}
 
 	try {
-		shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+		shared_ptr<FFmpegContent> joined (new FFmpegContent(fc));
 		film->remove_content (_content);
 		film->examine_and_add_content (joined);
 	} catch (JoinError& e) {
@@ -306,9 +306,9 @@ ContentMenu::find_missing ()
 
 	if (r == wxID_OK) {
 		if (dc) {
-			content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+			content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
 		} else {
-			content = content_factory (film, path);
+			content = content_factory (path);
 		}
 	}
 
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 8e6c49294..93b270faa 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -450,7 +450,7 @@ ContentPanel::add_folder_clicked ()
 	list<shared_ptr<Content> > content;
 
 	try {
-		content = content_factory (_film, path);
+		content = content_factory (path);
 	} catch (exception& e) {
 		error_dialog (_parent, e.what());
 		return;
@@ -493,7 +493,7 @@ ContentPanel::add_dcp_clicked ()
 	}
 
 	try {
-		_film->examine_and_add_content (shared_ptr<Content> (new DCPContent (_film, path)));
+		_film->examine_and_add_content (shared_ptr<Content> (new DCPContent (path)));
 	} catch (exception& e) {
 		error_dialog (_parent, e.what());
 	}
@@ -755,7 +755,7 @@ ContentPanel::add_files (list<boost::filesystem::path> paths)
 
 	try {
 		BOOST_FOREACH (boost::filesystem::path i, paths) {
-			BOOST_FOREACH (shared_ptr<Content> j, content_factory (_film, i)) {
+			BOOST_FOREACH (shared_ptr<Content> j, content_factory(i)) {
 				_film->examine_and_add_content (j);
 			}
 		}
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index cf805e8f7..af1dbdf14 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -214,7 +214,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 void
 Controls::add_clicked ()
 {
-	shared_ptr<Content> sel = selected_content()->clone();
+	shared_ptr<Content> sel = selected_content()->clone(_film);
 	DCPOMATIC_ASSERT (sel);
 	_film->examine_and_add_content (sel);
 	bool const ok = display_progress (_("DCP-o-matic"), _("Loading DCP"));
@@ -604,7 +604,7 @@ Controls::add_content_to_list (shared_ptr<Content> content, wxListCtrl* ctrl)
 	wxListItem it;
 	it.SetId(N);
 	it.SetColumn(0);
-	DCPTime length = content->length_after_trim ();
+	DCPTime length = content->length_after_trim (_film);
 	int seconds = length.seconds();
 	int minutes = seconds / 60;
 	seconds -= minutes * 60;
@@ -662,9 +662,9 @@ Controls::update_content_directory ()
 		try {
 			shared_ptr<Content> content;
 			if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) {
-				content.reset (new DCPContent(_film, *i));
+				content.reset (new DCPContent(*i));
 			} else if (i->path().extension() == ".mp4" || i->path().extension() == ".ecinema") {
-				content = content_factory(_film, *i).front();
+				content = content_factory(*i).front();
 			}
 
 			if (content) {
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index afa1940db..2d489b3e8 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -544,7 +544,7 @@ FilmViewer::quick_refresh ()
 		return false;
 	}
 
-	if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) {
+	if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
 		return false;
 	}
 
diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index c0821510c..5f480d5b4 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -153,8 +153,8 @@ PlayerInformation::triggered_update ()
 
 	string const len = String::compose(
 		wx_to_std(_("Length: %1 (%2 frames)")),
-		time_to_hmsf(dcp->full_length(), lrint(*vfr)),
-		dcp->full_length().frames_round(*vfr)
+		time_to_hmsf(dcp->full_length(fv->film()), lrint(*vfr)),
+		dcp->full_length(fv->film()).frames_round(*vfr)
 		);
 
 	checked_set (_dcp[r++], std_to_wx(len));
diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 6473cd68b..a37f5a2ce 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -39,8 +39,9 @@ int const SubtitleAppearanceDialog::NONE = 0;
 int const SubtitleAppearanceDialog::OUTLINE = 1;
 int const SubtitleAppearanceDialog::SHADOW = 2;
 
-SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<TextContent> caption)
+SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr<const Film> film, shared_ptr<Content> content, shared_ptr<TextContent> caption)
 	: wxDialog (parent, wxID_ANY, _("Caption appearance"))
+	, _film (film)
 	, _content (content)
 	, _caption (caption)
 {
@@ -164,17 +165,17 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 	optional<ContentTime> fade_in = _caption->fade_in();
 	_force_fade_in->SetValue (static_cast<bool>(fade_in));
 	if (fade_in) {
-		_fade_in->set (*fade_in, _content->active_video_frame_rate());
+		_fade_in->set (*fade_in, _content->active_video_frame_rate(film));
 	} else {
-		_fade_in->set (ContentTime(), _content->active_video_frame_rate());
+		_fade_in->set (ContentTime(), _content->active_video_frame_rate(film));
 	}
 
 	optional<ContentTime> fade_out = _caption->fade_out();
 	_force_fade_out->SetValue (static_cast<bool>(fade_out));
 	if (fade_out) {
-		_fade_out->set (*fade_out, _content->active_video_frame_rate ());
+		_fade_out->set (*fade_out, _content->active_video_frame_rate(film));
 	} else {
-		_fade_out->set (ContentTime(), _content->active_video_frame_rate ());
+		_fade_out->set (ContentTime(), _content->active_video_frame_rate(film));
 	}
 
 	_outline_width->SetValue (_caption->outline_width ());
@@ -213,6 +214,8 @@ SubtitleAppearanceDialog::set_to (wxWindow* w, int& r)
 void
 SubtitleAppearanceDialog::apply ()
 {
+	shared_ptr<const Film> film = _film.lock ();
+
 	if (_force_colour->GetValue ()) {
 		wxColour const c = _colour->GetColour ();
 		_caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
@@ -241,12 +244,12 @@ SubtitleAppearanceDialog::apply ()
 		_caption->unset_effect_colour ();
 	}
 	if (_force_fade_in->GetValue ()) {
-		_caption->set_fade_in (_fade_in->get (_content->active_video_frame_rate ()));
+		_caption->set_fade_in (_fade_in->get(_content->active_video_frame_rate(film)));
 	} else {
 		_caption->unset_fade_in ();
 	}
 	if (_force_fade_out->GetValue ()) {
-		_caption->set_fade_out (_fade_out->get (_content->active_video_frame_rate ()));
+		_caption->set_fade_out (_fade_out->get(_content->active_video_frame_rate(film)));
 	} else {
 		_caption->unset_fade_out ();
 	}
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 80ef58470..d02e283d9 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -32,11 +32,12 @@ class RGBAColourPicker;
 class FFmpegSubtitleStream;
 class wxCheckBox;
 class wxWidget;
+class Film;
 
 class SubtitleAppearanceDialog : public wxDialog
 {
 public:
-	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption);
+	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<const Film> film, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption);
 
 	void apply ();
 
@@ -46,6 +47,7 @@ private:
 	wxCheckBox* set_to (wxWindow* w, int& r);
 	void content_change (ChangeType type);
 
+	boost::weak_ptr<const Film> _film;
 	wxCheckBox* _force_colour;
 	wxColourPickerCtrl* _colour;
 	wxCheckBox* _force_effect;
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 350dddc0d..4b53a941e 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -457,7 +457,7 @@ TextPanel::setup_sensitivity ()
 	}
 
 	string why_not;
-	bool const can_reference = dcp && dcp->can_reference_text (_original_type, why_not);
+	bool const can_reference = dcp && dcp->can_reference_text (_parent->film(), _original_type, why_not);
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
 	bool const reference = _reference->GetValue ();
@@ -582,7 +582,7 @@ TextPanel::text_view_clicked ()
 	ContentList c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	shared_ptr<Decoder> decoder = decoder_factory (c.front(), _parent->film()->log(), false);
+	shared_ptr<Decoder> decoder = decoder_factory (_parent->film(), c.front(), false);
 
 	if (decoder) {
 		_text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());
@@ -627,7 +627,7 @@ TextPanel::appearance_dialog_clicked ()
 	ContentList c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front(), c.front()->text_of_original_type(_original_type));
+	SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type));
 	if (d->ShowModal () == wxID_OK) {
 		d->apply ();
 	}
diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 9b591b191..49a98dc5e 100644
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -96,7 +96,7 @@ TextView::TextView (
 			i->Stop.connect (bind (&TextView::data_stop, this, _1));
 		}
 	}
-	while (!decoder->pass ()) {}
+	while (!decoder->pass (film)) {}
 	SetSizerAndFit (sizer);
 }
 
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index a607b1eb1..206c13cf6 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -268,7 +268,7 @@ Timeline::film_content_change (ChangeType type, int property, bool frequent)
 
 template <class T>
 int
-place (TimelineViewList& views, int& tracks)
+place (shared_ptr<const Film> film, TimelineViewList& views, int& tracks)
 {
 	int const base = tracks;
 
@@ -282,7 +282,7 @@ place (TimelineViewList& views, int& tracks)
 		int t = base;
 
 		shared_ptr<Content> content = cv->content();
-		DCPTimePeriod const content_period (content->position(), content->end());
+		DCPTimePeriod const content_period (content->position(), content->end(film));
 
 		while (true) {
 			TimelineViewList::iterator j = views.begin();
@@ -296,7 +296,7 @@ place (TimelineViewList& views, int& tracks)
 				shared_ptr<Content> test_content = test->content();
 				if (
 					test->track() && test->track().get() == t &&
-					content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end()))) {
+					content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end(film)))) {
 					/* we have an overlap on track `t' */
 					++t;
 					break;
@@ -354,6 +354,9 @@ Timeline::assign_tracks ()
 	   Audio N
 	*/
 
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+
 	_tracks = 0;
 
 	for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
@@ -386,7 +389,7 @@ Timeline::assign_tracks ()
 
 	/* Texts */
 
-	int const text_tracks = place<TimelineTextContentView> (_views, _tracks);
+	int const text_tracks = place<TimelineTextContentView> (film, _views, _tracks);
 
 	/* Atmos */
 
@@ -412,7 +415,7 @@ Timeline::assign_tracks ()
 
 	TimelineViewList views = _views;
 	sort(views.begin(), views.end(), AudioMappingComparator());
-	int const audio_tracks = place<TimelineAudioContentView> (views, _tracks);
+	int const audio_tracks = place<TimelineAudioContentView> (film, views, _tracks);
 
 	_labels_view->set_3d (have_3d);
 	_labels_view->set_audio_tracks (audio_tracks);
@@ -520,10 +523,13 @@ Timeline::left_down_select (wxMouseEvent& ev)
 				continue;
 			}
 
+			shared_ptr<Film> film = _film.lock ();
+			DCPOMATIC_ASSERT (film);
+
 			_start_snaps.push_back (cv->content()->position());
 			_end_snaps.push_back (cv->content()->position());
-			_start_snaps.push_back (cv->content()->end());
-			_end_snaps.push_back (cv->content()->end());
+			_start_snaps.push_back (cv->content()->end(film));
+			_end_snaps.push_back (cv->content()->end(film));
 
 			BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points()) {
 				_start_snaps.push_back (i);
@@ -725,9 +731,11 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 
 	DCPTime new_position = _down_view_position + DCPTime::from_seconds ((p.x - _down_point.x) / pps);
 
-	if (_snap) {
+	shared_ptr<Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
 
-		DCPTime const new_end = new_position + _down_view->content()->length_after_trim();
+	if (_snap) {
+		DCPTime const new_end = new_position + _down_view->content()->length_after_trim(film);
 		/* Signed `distance' to nearest thing (i.e. negative is left on the timeline,
 		   positive is right).
 		*/
@@ -755,10 +763,8 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 		new_position = DCPTime ();
 	}
 
-	_down_view->content()->set_position (new_position);
+	_down_view->content()->set_position (film, new_position);
 
-	shared_ptr<Film> film = _film.lock ();
-	DCPOMATIC_ASSERT (film);
 	film->set_sequence (false);
 }
 
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 12691f661..69f1723ce 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -50,7 +50,7 @@ TimelineContentView::bbox () const
 	return dcpomatic::Rect<int> (
 		time_x (content->position ()),
 		y_pos (_track.get()),
-		content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0),
+		content->length_after_trim(film).seconds() * _timeline.pixels_per_second().get_value_or(0),
 		_timeline.pixels_per_track()
 		);
 }
@@ -104,7 +104,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 	}
 
 	DCPTime const position = cont->position ();
-	DCPTime const len = cont->length_after_trim ();
+	DCPTime const len = cont->length_after_trim (film);
 
 	wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
 
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index b1d13367f..cbaed6870 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -227,11 +227,11 @@ TimingPanel::update_full_length ()
 {
 	set<DCPTime> check;
 	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-		check.insert (i->full_length ());
+		check.insert (i->full_length(_parent->film()));
 	}
 
 	if (check.size() == 1) {
-		_full_length->set (_parent->selected().front()->full_length (), _parent->film()->video_frame_rate ());
+		_full_length->set (_parent->selected().front()->full_length(_parent->film()), _parent->film()->video_frame_rate());
 	} else {
 		_full_length->clear ();
 	}
@@ -242,11 +242,11 @@ TimingPanel::update_play_length ()
 {
 	set<DCPTime> check;
 	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-		check.insert (i->length_after_trim ());
+		check.insert (i->length_after_trim(_parent->film()));
 	}
 
 	if (check.size() == 1) {
-		_play_length->set (_parent->selected().front()->length_after_trim (), _parent->film()->video_frame_rate ());
+		_play_length->set (_parent->selected().front()->length_after_trim(_parent->film()), _parent->film()->video_frame_rate());
 	} else {
 		_play_length->clear ();
 	}
@@ -371,7 +371,7 @@ TimingPanel::position_changed ()
 {
 	DCPTime const pos = _position->get (_parent->film()->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		i->set_position (pos);
+		i->set_position (_parent->film(), pos);
 	}
 }
 
@@ -407,7 +407,7 @@ TimingPanel::trim_start_changed ()
 	ContentTime const trim = _trim_start->get (_parent->film()->video_frame_rate ());
 
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		if (i->position() <= ph && ph < i->end()) {
+		if (i->position() <= ph && ph < i->end(_parent->film())) {
 			/* The playhead is in i.  Use it as a reference to work out
 			   where to put the playhead post-trim; we're trying to keep the playhead
 			   at the same frame of content that we're looking at pre-trim.
@@ -457,7 +457,7 @@ TimingPanel::play_length_changed ()
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
 		FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ());
 		i->set_trim_end (
-			ContentTime (max(DCPTime(), i->full_length() - play_length), frc) - i->trim_start ()
+			ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start()
 			);
 	}
 }
@@ -522,9 +522,9 @@ TimingPanel::trim_start_to_playhead_clicked ()
 	fv->set_coalesce_player_changes (true);
 
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		if (i->position() < ph && ph < i->end ()) {
-			FrameRateChange const frc = film->active_frame_rate_change (i->position ());
-			i->set_trim_start (i->trim_start() + ContentTime (ph - i->position (), frc));
+		if (i->position() < ph && ph < i->end(film)) {
+			FrameRateChange const frc = film->active_frame_rate_change (i->position());
+			i->set_trim_start (i->trim_start() + ContentTime (ph - i->position(), frc));
 			new_ph = i->position ();
 		}
 	}
@@ -547,9 +547,9 @@ TimingPanel::trim_end_to_playhead_clicked ()
 	shared_ptr<const Film> film = _parent->film ();
 	DCPTime const ph = fv->position().floor (film->video_frame_rate ());
 	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-		if (i->position() < ph && ph < i->end ()) {
+		if (i->position() < ph && ph < i->end(film)) {
 			FrameRateChange const frc = film->active_frame_rate_change (i->position ());
-			i->set_trim_end (ContentTime (i->position() + i->full_length() - ph - DCPTime::from_frames (1, frc.dcp), frc) - i->trim_start());
+			i->set_trim_end (ContentTime(i->position() + i->full_length(film) - ph - DCPTime::from_frames(1, frc.dcp), frc) - i->trim_start());
 		}
 	}
 }
@@ -572,7 +572,7 @@ TimingPanel::setup_sensitivity ()
 	DCPTime const ph = fv->position ();
 	bool any_over_ph = false;
 	BOOST_FOREACH (shared_ptr<const Content> i, _parent->selected ()) {
-		if (i->position() <= ph && ph < i->end()) {
+		if (i->position() <= ph && ph < i->end(_parent->film())) {
 			any_over_ph = true;
 		}
 	}
@@ -601,8 +601,8 @@ TimingPanel::move_to_start_of_reel_clicked ()
 	MoveToDialog* d = new MoveToDialog (this, position, _parent->film());
 
 	if (d->ShowModal() == wxID_OK) {
-		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected ()) {
-			i->set_position (d->position ());
+		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+			i->set_position (_parent->film(), d->position());
 		}
 	}
 	d->Destroy ();
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index c525c1003..55c0984a3 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -361,8 +361,8 @@ VideoPanel::film_content_changed (int property)
 
 		if (check.size() == 1) {
 			_fade_in->set (
-				ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()),
-				vc.front()->active_video_frame_rate ()
+				ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())),
+				vc.front()->active_video_frame_rate(_parent->film())
 				);
 		} else {
 			_fade_in->clear ();
@@ -375,8 +375,8 @@ VideoPanel::film_content_changed (int property)
 
 		if (check.size() == 1) {
 			_fade_out->set (
-				ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()),
-				vc.front()->active_video_frame_rate ()
+				ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())),
+				vc.front()->active_video_frame_rate(_parent->film())
 				);
 		} else {
 			_fade_out->clear ();
@@ -420,7 +420,7 @@ VideoPanel::setup_description ()
 		return;
 	}
 
-	string d = vc.front()->video->processing_description ();
+	string d = vc.front()->video->processing_description (_parent->film());
 	size_t lines = count (d.begin(), d.end(), '\n');
 
 	for (int i = lines; i < 6; ++i) {
@@ -504,7 +504,7 @@ VideoPanel::setup_sensitivity ()
 	}
 
 	string why_not;
-	bool const can_reference = dcp && dcp->can_reference_video (why_not);
+	bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
 	if (_reference->GetValue ()) {