X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=93bcc0a6d4042f05a4980e96f1212ea49ebfc27f;hp=174d625b8c1eea2fdee199f36b67203a83540cd7;hb=09df98b2b47f6f9a754d5ff8a1787da5a07c14b4;hpb=494c263c852d1e37be809920cb72e76a29c4ef08

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 174d625b8..93bcc0a6d 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,37 +18,55 @@
 
 */
 
+
+#include "auto_crop_dialog.h"
+#include "content_advanced_dialog.h"
 #include "content_menu.h"
+#include "content_properties_dialog.h"
+#include "film_viewer.h"
 #include "repeat_dialog.h"
-#include "wx_util.h"
-#include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
-#include "content_properties_dialog.h"
-#include "lib/playlist.h"
-#include "lib/film.h"
-#include "lib/image_content.h"
+#include "timeline_video_content_view.h"
+#include "wx_util.h"
+#include "lib/audio_content.h"
+#include "lib/config.h"
 #include "lib/content_factory.h"
-#include "lib/examine_content_job.h"
-#include "lib/job_manager.h"
-#include "lib/exceptions.h"
+#include "lib/copy_dcp_details_to_film.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_examiner.h"
+#include "lib/examine_content_job.h"
+#include "lib/exceptions.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/audio_content.h"
+#include "lib/film.h"
+#include "lib/guess_crop.h"
+#include "lib/image_content.h"
+#include "lib/job_manager.h"
+#include "lib/playlist.h"
+#include "lib/video_content.h"
 #include <dcp/cpl.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
-#include <wx/wx.h>
+#include <dcp/search.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/dirdlg.h>
-#include <boost/foreach.hpp>
-#include <iostream>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
-using std::cout;
-using std::vector;
+
+using std::dynamic_pointer_cast;
 using std::exception;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+using std::vector;
+using std::weak_ptr;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
+
 
 enum {
 	/* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
@@ -56,28 +74,36 @@ enum {
 	ID_join,
 	ID_find_missing,
 	ID_properties,
+	ID_advanced,
 	ID_re_examine,
+	ID_auto_crop,
 	ID_kdm,
 	ID_ov,
 	ID_choose_cpl,
+	ID_set_dcp_settings,
 	ID_remove
 };
 
-ContentMenu::ContentMenu (wxWindow* p)
+
+ContentMenu::ContentMenu (wxWindow* p, weak_ptr<FilmViewer> viewer)
 	: _menu (new wxMenu)
 	, _parent (p)
 	, _pop_up_open (false)
+	, _viewer (viewer)
 {
 	_repeat = _menu->Append (ID_repeat, _("Repeat..."));
 	_join = _menu->Append (ID_join, _("Join"));
 	_find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
-	_properties = _menu->Append (ID_properties, _("Properties..."));
 	_re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
+	_auto_crop = _menu->Append (ID_auto_crop, _("Auto-crop..."));
+	_properties = _menu->Append (ID_properties, _("Properties..."));
+	_advanced = _menu->Append (ID_advanced, _("Advanced settings..."));
 	_menu->AppendSeparator ();
 	_kdm = _menu->Append (ID_kdm, _("Add KDM..."));
 	_ov = _menu->Append (ID_ov, _("Add OV..."));
 	_cpl_menu = new wxMenu ();
 	_choose_cpl = _menu->Append (ID_choose_cpl, _("Choose CPL..."), _cpl_menu);
+	_set_dcp_settings = _menu->Append (ID_set_dcp_settings, _("Set project DCP settings from this DCP"));
 	_menu->AppendSeparator ();
 	_remove = _menu->Append (ID_remove, _("Remove"));
 
@@ -85,9 +111,12 @@ ContentMenu::ContentMenu (wxWindow* p)
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::join, this), ID_join);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties);
+	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::advanced, this), ID_advanced);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
+	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::auto_crop, this), ID_auto_crop);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov);
+	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::set_dcp_settings, this), ID_set_dcp_settings);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::remove, this), ID_remove);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1);
 }
@@ -107,7 +136,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 	_repeat->Enable (!_content.empty ());
 
 	int n = 0;
-	BOOST_FOREACH (shared_ptr<Content> i, _content) {
+	for (auto i: _content) {
 		if (dynamic_pointer_cast<FFmpegContent> (i)) {
 			++n;
 		}
@@ -117,40 +146,48 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 
 	_find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
 	_properties->Enable (_content.size() == 1);
+	_advanced->Enable (_content.size() == 1);
 	_re_examine->Enable (!_content.empty ());
+	_auto_crop->Enable (_content.size() == 1);
 
 	if (_content.size() == 1) {
-		shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+		auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
 		if (dcp) {
 			_kdm->Enable (dcp->encrypted ());
 			_ov->Enable (dcp->needs_assets ());
+			_set_dcp_settings->Enable (static_cast<bool>(dcp));
 			try {
-				DCPExaminer ex (dcp);
-				list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+				auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
 				_choose_cpl->Enable (cpls.size() > 1);
 				/* We can't have 0 as a menu item ID on OS X */
 				int id = 1;
-				BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
-					wxMenuItem* item = _cpl_menu->AppendCheckItem (
+				for (auto i: cpls) {
+					auto item = _cpl_menu->AppendRadioItem (
 						id++,
 						wxString::Format (
 							"%s (%s)",
-							std_to_wx(i->annotation_text()).data(),
+							std_to_wx(i->annotation_text().get_value_or("")).data(),
 							std_to_wx(i->id()).data()
 							)
 						);
 					item->Check (dcp->cpl() && dcp->cpl() == i->id());
 				}
-			} catch (dcp::DCPReadError) {
+			} catch (dcp::ReadError &) {
 				/* The DCP is probably missing */
+			} catch (dcp::KDMDecryptionError &) {
+				/* We have an incorrect KDM */
+			} catch (KDMError &) {
+				/* We have an incorrect KDM */
 			}
 		} else {
 			_kdm->Enable (false);
 			_ov->Enable (false);
 			_choose_cpl->Enable (false);
+			_set_dcp_settings->Enable (false);
 		}
 	} else {
 		_kdm->Enable (false);
+		_set_dcp_settings->Enable (false);
 	}
 
 	_remove->Enable (!_content.empty ());
@@ -160,6 +197,22 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 	_pop_up_open = false;
 }
 
+
+void
+ContentMenu::set_dcp_settings ()
+{
+	auto film = _film.lock ();
+	if (!film) {
+		return;
+	}
+
+	DCPOMATIC_ASSERT (_content.size() == 1);
+	auto dcp = dynamic_pointer_cast<DCPContent>(_content.front());
+	DCPOMATIC_ASSERT (dcp);
+	copy_dcp_details_to_film (dcp, film);
+}
+
+
 void
 ContentMenu::repeat ()
 {
@@ -167,13 +220,13 @@ ContentMenu::repeat ()
 		return;
 	}
 
-	RepeatDialog* d = new RepeatDialog (_parent);
+	auto d = new RepeatDialog (_parent);
 	if (d->ShowModal() != wxID_OK) {
 		d->Destroy ();
 		return;
 	}
 
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
@@ -185,12 +238,13 @@ ContentMenu::repeat ()
 	_views.clear ();
 }
 
+
 void
 ContentMenu::join ()
 {
-	vector<shared_ptr<Content> > fc;
-	BOOST_FOREACH (shared_ptr<Content> i, _content) {
-		shared_ptr<FFmpegContent> f = dynamic_pointer_cast<FFmpegContent> (i);
+	vector<shared_ptr<Content>> fc;
+	for (auto i: _content) {
+		auto f = dynamic_pointer_cast<FFmpegContent> (i);
 		if (f) {
 			fc.push_back (f);
 		}
@@ -198,13 +252,13 @@ ContentMenu::join ()
 
 	DCPOMATIC_ASSERT (fc.size() > 1);
 
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
 
 	try {
-		shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+		auto joined = make_shared<FFmpegContent>(fc);
 		film->remove_content (_content);
 		film->examine_and_add_content (joined);
 	} catch (JoinError& e) {
@@ -212,6 +266,7 @@ ContentMenu::join ()
 	}
 }
 
+
 void
 ContentMenu::remove ()
 {
@@ -219,7 +274,7 @@ ContentMenu::remove ()
 		return;
 	}
 
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
@@ -230,8 +285,8 @@ ContentMenu::remove ()
 		/* Special case: we only remove FFmpegContent if its video view is selected;
 		   if not, and its audio view is selected, we unmap the audio.
 		*/
-		BOOST_FOREACH (shared_ptr<Content> i, _content) {
-			shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (i);
+		for (auto i: _content) {
+			auto fc = dynamic_pointer_cast<FFmpegContent> (i);
 			if (!fc) {
 				continue;
 			}
@@ -239,9 +294,9 @@ ContentMenu::remove ()
 			shared_ptr<TimelineVideoContentView> video;
 			shared_ptr<TimelineAudioContentView> audio;
 
-			BOOST_FOREACH (shared_ptr<TimelineContentView> j, _views) {
-				shared_ptr<TimelineVideoContentView> v = dynamic_pointer_cast<TimelineVideoContentView> (j);
-				shared_ptr<TimelineAudioContentView> a = dynamic_pointer_cast<TimelineAudioContentView> (j);
+			for (auto j: _views) {
+				auto v = dynamic_pointer_cast<TimelineVideoContentView>(j);
+				auto a = dynamic_pointer_cast<TimelineAudioContentView>(j);
 				if (v && v->content() == fc) {
 					video = v;
 				} else if (a && a->content() == fc) {
@@ -250,7 +305,7 @@ ContentMenu::remove ()
 			}
 
 			if (!video && audio) {
-				AudioMapping m = fc->audio->mapping ();
+				auto m = fc->audio->mapping ();
 				m.unmap_all ();
 				fc->audio->set_mapping (m);
 				handled = true;
@@ -266,6 +321,7 @@ ContentMenu::remove ()
 	_views.clear ();
 }
 
+
 void
 ContentMenu::find_missing ()
 {
@@ -273,37 +329,37 @@ ContentMenu::find_missing ()
 		return;
 	}
 
-	shared_ptr<const Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
 
 	/* XXX: a bit nasty */
-	shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (_content.front ());
-	shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (_content.front ());
+	auto ic = dynamic_pointer_cast<ImageContent> (_content.front());
+	auto dc = dynamic_pointer_cast<DCPContent> (_content.front());
 
 	int r = wxID_CANCEL;
 	boost::filesystem::path path;
 
 	if ((ic && !ic->still ()) || dc) {
-		wxDirDialog* d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+		auto d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
 		r = d->ShowModal ();
 		path = wx_to_std (d->GetPath ());
 		d->Destroy ();
 	} else {
-		wxFileDialog* d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+		auto d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"));
 		r = d->ShowModal ();
 		path = wx_to_std (d->GetPath ());
 		d->Destroy ();
 	}
 
-	list<shared_ptr<Content> > content;
+	list<shared_ptr<Content>> content;
 
 	if (r == wxID_OK) {
 		if (dc) {
-			content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+			content.push_back (make_shared<DCPContent>(path));
 		} else {
-			content = content_factory (film, path);
+			content = content_factory (path);
 		}
 	}
 
@@ -311,16 +367,16 @@ ContentMenu::find_missing ()
 		return;
 	}
 
-	BOOST_FOREACH (shared_ptr<Content> i, content) {
-		shared_ptr<Job> j (new ExamineContentJob (film, i));
+	for (auto i: content) {
+		auto j = make_shared<ExamineContentJob>(film, i);
 
 		j->Finished.connect (
 			bind (
 				&ContentMenu::maybe_found_missing,
 				this,
-				boost::weak_ptr<Job> (j),
-				boost::weak_ptr<Content> (_content.front ()),
-				boost::weak_ptr<Content> (i)
+				std::weak_ptr<Job> (j),
+				std::weak_ptr<Content> (_content.front ()),
+				std::weak_ptr<Content> (i)
 				)
 			);
 
@@ -331,12 +387,12 @@ ContentMenu::find_missing ()
 void
 ContentMenu::re_examine ()
 {
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
 
-	BOOST_FOREACH (shared_ptr<Content> i, _content) {
+	for (auto i: _content) {
 		JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, i)));
 	}
 }
@@ -344,13 +400,13 @@ ContentMenu::re_examine ()
 void
 ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_ptr<Content> nc)
 {
-	shared_ptr<Job> job = j.lock ();
+	auto job = j.lock ();
 	if (!job || !job->finished_ok ()) {
 		return;
 	}
 
-	shared_ptr<Content> old_content = oc.lock ();
-	shared_ptr<Content> new_content = nc.lock ();
+	auto old_content = oc.lock ();
+	auto new_content = nc.lock ();
 	DCPOMATIC_ASSERT (old_content);
 	DCPOMATIC_ASSERT (new_content);
 
@@ -366,23 +422,50 @@ void
 ContentMenu::kdm ()
 {
 	DCPOMATIC_ASSERT (!_content.empty ());
-	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+	auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
 	DCPOMATIC_ASSERT (dcp);
 
-	wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM"));
+	auto d = new wxFileDialog (_parent, _("Select KDM"));
 
 	if (d->ShowModal() == wxID_OK) {
+		optional<dcp::EncryptedKDM> kdm;
 		try {
-			dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
+			kdm = dcp::EncryptedKDM (dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE));
 		} catch (exception& e) {
-			error_dialog (_parent, wxString::Format (_("Could not load KDM (%s)"), e.what ()));
+			error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
 			d->Destroy ();
 			return;
 		}
 
-		shared_ptr<Film> film = _film.lock ();
+		/* Try to decrypt it to get an early preview of any errors */
+		try {
+			decrypt_kdm_with_helpful_error (*kdm);
+		} catch (KDMError& e) {
+			error_dialog (_parent, std_to_wx(e.summary()), std_to_wx(e.detail()));
+			return;
+		} catch (exception& e) {
+			error_dialog (_parent, e.what());
+			return;
+		}
+
+		auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
+		bool const kdm_matches_any_cpl = std::any_of(cpls.begin(), cpls.end(), [kdm](shared_ptr<const dcp::CPL> cpl) { return cpl->id() == kdm->cpl_id(); });
+		bool const kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get();
+
+		if (!kdm_matches_any_cpl) {
+			error_dialog (_parent, _("This KDM was not made for this DCP.  You will need a different one."));
+			return;
+		}
+
+		if (!kdm_matches_selected_cpl && kdm_matches_any_cpl) {
+			message_dialog (_parent, _("This KDM was made for one of the CPLs in this DCP, but not the currently selected one.  To play the currently-selected CPL you will need a different KDM."));
+		}
+
+		dcp->add_kdm (*kdm);
+
+		auto film = _film.lock ();
 		DCPOMATIC_ASSERT (film);
-		JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
+		JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
 	}
 
 	d->Destroy ();
@@ -392,16 +475,16 @@ void
 ContentMenu::ov ()
 {
 	DCPOMATIC_ASSERT (!_content.empty ());
-	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+	auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
 	DCPOMATIC_ASSERT (dcp);
 
-	wxDirDialog* d = new wxDirDialog (_parent, _("Select OV"));
+	auto d = new wxDirDialog (_parent, _("Select OV"));
 
 	if (d->ShowModal() == wxID_OK) {
-		dcp->add_ov (wx_to_std (d->GetPath ()));
+		dcp->add_ov (wx_to_std (d->GetPath()));
 		shared_ptr<Film> film = _film.lock ();
 		DCPOMATIC_ASSERT (film);
-		JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
+		JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
 	}
 
 	d->Destroy ();
@@ -410,11 +493,23 @@ ContentMenu::ov ()
 void
 ContentMenu::properties ()
 {
-	ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ());
+	auto film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	auto d = new ContentPropertiesDialog (_parent, film, _content.front());
+	d->ShowModal ();
+	d->Destroy ();
+}
+
+
+void
+ContentMenu::advanced ()
+{
+	auto d = new ContentAdvancedDialog (_parent, _content.front());
 	d->ShowModal ();
 	d->Destroy ();
 }
 
+
 void
 ContentMenu::cpl_selected (wxCommandEvent& ev)
 {
@@ -423,21 +518,101 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
 	}
 
 	DCPOMATIC_ASSERT (!_content.empty ());
-	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+	auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
 	DCPOMATIC_ASSERT (dcp);
 
-	DCPExaminer ex (dcp);
-	list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+	auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
 	DCPOMATIC_ASSERT (ev.GetId() > 0);
 	DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));
 
-	list<shared_ptr<dcp::CPL> >::const_iterator i = cpls.begin ();
+	auto i = cpls.begin ();
 	for (int j = 0; j < ev.GetId() - 1; ++j) {
 		++i;
 	}
 
 	dcp->set_cpl ((*i)->id ());
-	shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	DCPOMATIC_ASSERT (film);
-	JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
+	JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
+}
+
+
+void
+ContentMenu::auto_crop ()
+{
+	DCPOMATIC_ASSERT (_content.size() == 1);
+
+	auto film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	auto viewer = _viewer.lock ();
+	DCPOMATIC_ASSERT (viewer);
+
+	auto update_viewer = [this](Crop crop) {
+		auto film = _film.lock();
+		DCPOMATIC_ASSERT (film);
+		auto viewer = _viewer.lock ();
+		DCPOMATIC_ASSERT (viewer);
+		auto const content = _content.front();
+		auto const current_crop = content->video->actual_crop();
+		viewer->set_crop_guess (
+			dcpomatic::Rect<float>(
+				static_cast<float>(std::max(0, crop.left - current_crop.left)) / content->video->size().width,
+				static_cast<float>(std::max(0, crop.top - current_crop.top)) / content->video->size().height,
+				1.0f - (static_cast<float>(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / content->video->size().width),
+				1.0f - (static_cast<float>(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / content->video->size().height)
+				));
+	};
+
+	auto guess_crop_for_content = [this, film, viewer]() {
+		auto position = viewer->position_in_content(_content.front()).get_value_or(
+			ContentTime::from_frames(_content.front()->video->length(), _content.front()->video_frame_rate().get_value_or(24))
+			);
+		return guess_crop(film, _content.front(), Config::instance()->auto_crop_threshold(), position);
+	};
+
+	/* Make an initial guess in the view and open the dialog */
+
+	auto const crop = guess_crop_for_content ();
+	update_viewer (crop);
+
+	if (_auto_crop_dialog) {
+		_auto_crop_dialog->Destroy();
+		_auto_crop_dialog = nullptr;
+	}
+	_auto_crop_dialog = new AutoCropDialog (_parent, crop);
+	_auto_crop_dialog->Show ();
+
+	/* Update the dialog and view when the crop threshold changes */
+	_auto_crop_config_connection = Config::instance()->Changed.connect([this, guess_crop_for_content, update_viewer](Config::Property property) {
+		auto film = _film.lock();
+		DCPOMATIC_ASSERT (film);
+		if (property == Config::AUTO_CROP_THRESHOLD) {
+			auto const crop = guess_crop_for_content();
+			_auto_crop_dialog->set(crop);
+			update_viewer(crop);
+		}
+	});
+
+	/* Also update the dialog and view when we're looking at a different frame */
+	_auto_crop_viewer_connection = viewer->ImageChanged.connect([this, guess_crop_for_content, update_viewer](shared_ptr<PlayerVideo>) {
+		auto const crop = guess_crop_for_content();
+		_auto_crop_dialog->set(crop);
+		update_viewer(crop);
+	});
+
+	/* Handle the user closing the dialog (with OK or cancel) */
+	_auto_crop_dialog->Bind (wxEVT_BUTTON, [this, viewer](wxCommandEvent& ev) {
+		_auto_crop_config_connection.disconnect ();
+		_auto_crop_viewer_connection.disconnect ();
+		if (ev.GetId() == wxID_OK) {
+			_content.front()->video->set_crop(_auto_crop_dialog->get());
+		}
+		_auto_crop_dialog->Show (false);
+		viewer->unset_crop_guess ();
+	});
+
+	/* Update the view when something in the dialog is changed */
+	_auto_crop_dialog->Changed.connect([update_viewer](Crop crop) {
+		update_viewer (crop);
+	});
 }