Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.

11 files changed, 81 insertions, 197 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index a6f4d53c0..302ed4184 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -20,7 +20,6 @@
 
 #include "dcp_panel.h"
 #include "wx_util.h"
-#include "isdcf_metadata_dialog.h"
 #include "audio_dialog.h"
 #include "focus_manager.h"
 #include "check_box.h"
@@ -85,7 +84,6 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
 	FocusManager::instance()->add(_name);
 
 	_use_isdcf_name = new CheckBox (_panel, _("Use ISDCF name"));
-	_edit_isdcf_button = new Button (_panel, _("Details..."));
 	_copy_isdcf_name_button = new Button (_panel, _("Copy as name"));
 
 	/* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see
@@ -126,7 +124,6 @@ DCPPanel::DCPPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> v
 
 	_name->Bind		     (wxEVT_TEXT,     boost::bind (&DCPPanel::name_changed, this));
 	_use_isdcf_name->Bind	     (wxEVT_CHECKBOX, boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
-	_edit_isdcf_button->Bind     (wxEVT_BUTTON,   boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
 	_copy_isdcf_name_button->Bind(wxEVT_BUTTON,   boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this));
 	_dcp_content_type->Bind	     (wxEVT_CHOICE,   boost::bind (&DCPPanel::dcp_content_type_changed, this));
 	_encrypted->Bind             (wxEVT_CHECKBOX, boost::bind (&DCPPanel::encrypted_toggled, this));
@@ -162,8 +159,8 @@ DCPPanel::add_to_grid ()
 
 	auto name_sizer = new wxBoxSizer (wxHORIZONTAL);
 	name_sizer->Add (_name_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-	name_sizer->Add (_name, 1, wxALIGN_CENTER_VERTICAL);
-	_grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
+	name_sizer->Add (_name, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+	_grid->Add (name_sizer, wxGBPosition(r, 0), wxGBSpan(1, 2), wxRIGHT | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
 	++r;
 
 	int flags = wxALIGN_CENTER_VERTICAL;
@@ -173,14 +170,13 @@ DCPPanel::add_to_grid ()
 
 	_grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
 	{
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (_edit_isdcf_button, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
-		s->Add (_copy_isdcf_name_button, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
+		auto s = new wxBoxSizer (wxHORIZONTAL);
+		s->Add (_copy_isdcf_name_button, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
 		_grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
 	}
 	++r;
 
-	_grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
+	_grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
 	++r;
 
 	add_label_to_sizer (_grid, _dcp_content_type_label, true, wxGBPosition (r, 0));
@@ -379,12 +375,8 @@ DCPPanel::film_changed (Film::Property p)
 			}
 		}
 		setup_dcp_name ();
-		_edit_isdcf_button->Enable (_film->use_isdcf_name ());
 		break;
 	}
-	case Film::Property::ISDCF_METADATA:
-		setup_dcp_name ();
-		break;
 	case Film::Property::VIDEO_FRAME_RATE:
 	{
 		bool done = false;
@@ -457,6 +449,7 @@ DCPPanel::film_changed (Film::Property p)
 	case Film::Property::RED_BAND:
 	case Film::Property::TWO_D_VERSION_OF_THREE_D:
 	case Film::Property::CHAIN:
+	case Film::Property::LUMINANCE:
 		setup_dcp_name ();
 		break;
 	default:
@@ -575,7 +568,6 @@ DCPPanel::set_film (shared_ptr<Film> film)
 	film_changed (Film::Property::RESOLUTION);
 	film_changed (Film::Property::ENCRYPTED);
 	film_changed (Film::Property::J2K_BANDWIDTH);
-	film_changed (Film::Property::ISDCF_METADATA);
 	film_changed (Film::Property::VIDEO_FRAME_RATE);
 	film_changed (Film::Property::AUDIO_CHANNELS);
 	film_changed (Film::Property::SEQUENCE);
@@ -601,7 +593,6 @@ DCPPanel::setup_sensitivity ()
 {
 	_name->Enable                   (_generally_sensitive);
 	_use_isdcf_name->Enable         (_generally_sensitive);
-	_edit_isdcf_button->Enable      (_generally_sensitive);
 	_dcp_content_type->Enable       (_generally_sensitive);
 	_copy_isdcf_name_button->Enable (_generally_sensitive);
 	_encrypted->Enable              (_generally_sensitive);
@@ -648,19 +639,6 @@ DCPPanel::use_isdcf_name_toggled ()
 }
 
 void
-DCPPanel::edit_isdcf_button_clicked ()
-{
-	if (!_film) {
-		return;
-	}
-
-	auto d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata ());
-	d->ShowModal ();
-	_film->set_isdcf_metadata (d->isdcf_metadata ());
-	d->Destroy ();
-}
-
-void
 DCPPanel::setup_dcp_name ()
 {
 	_dcp_name->SetLabel (std_to_wx (_film->dcp_name (true)));
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 9b362a26c..a076e4bb4 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -64,7 +64,6 @@ public:
 private:
 	void name_changed ();
 	void use_isdcf_name_toggled ();
-	void edit_isdcf_button_clicked ();
 	void copy_isdcf_name_button_clicked ();
 	void container_changed ();
 	void dcp_content_type_changed ();
@@ -118,7 +117,6 @@ private:
 	wxStaticText* _container_label;
 	wxChoice* _container;
 	wxStaticText* _container_size;
-	wxButton* _edit_isdcf_button;
 	wxButton* _copy_isdcf_name_button;
 	wxStaticText* _j2k_bandwidth_label;
 	wxStaticText* _mbits_label;
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 27159e7f2..962295528 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -28,7 +28,6 @@
 #include "filter_dialog.h"
 #include "dir_picker_ctrl.h"
 #include "file_picker_ctrl.h"
-#include "isdcf_metadata_dialog.h"
 #include "server_dialog.h"
 #include "make_chain_dialog.h"
 #include "email_dialog.h"
@@ -275,10 +274,6 @@ private:
 #endif
 		table->Add (_directory, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-		_isdcf_metadata_button = new Button (_panel, _("Edit..."));
-		table->Add (_isdcf_metadata_button);
-
 		add_label_to_sizer (table, _panel, _("Default container"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_container = new wxChoice (_panel, wxID_ANY);
 		table->Add (_container);
@@ -328,8 +323,6 @@ private:
 		_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this));
 		_kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::kdm_directory_changed, this));
 
-		_isdcf_metadata_button->Bind (wxEVT_BUTTON, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this));
-
 		for (auto i: Ratio::containers()) {
 			_container->Append (std_to_wx(i->container_nickname()));
 		}
@@ -414,14 +407,6 @@ private:
 		Config::instance()->set_default_kdm_directory (wx_to_std (_kdm_directory->GetPath ()));
 	}
 
-	void edit_isdcf_metadata_clicked ()
-	{
-		auto d = new ISDCFMetadataDialog (_panel, Config::instance()->default_isdcf_metadata ());
-		d->ShowModal ();
-		Config::instance()->set_default_isdcf_metadata (d->isdcf_metadata ());
-		d->Destroy ();
-	}
-
 	void still_length_changed ()
 	{
 		Config::instance()->set_default_still_length (_still_length->GetValue ());
@@ -446,7 +431,6 @@ private:
 
 	wxSpinCtrl* _j2k_bandwidth;
 	wxSpinCtrl* _audio_delay;
-	wxButton* _isdcf_metadata_button;
 	wxSpinCtrl* _still_length;
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	DirPickerCtrl* _directory;
diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
deleted file mode 100644
index ea390c1bb..000000000
--- a/src/wx/isdcf_metadata_dialog.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "isdcf_metadata_dialog.h"
-#include "wx_util.h"
-#include "check_box.h"
-#include "lib/film.h"
-#include <wx/wx.h>
-#include <wx/sizer.h>
-#include <wx/spinctrl.h>
-
-using std::shared_ptr;
-
-/** @param parent Parent window.
- *  @param dm Initial ISDCF metadata.
- *  @param threed true if the film is in 3D.
- */
-ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
-	: TableDialog (parent, _("ISDCF name"), 2, 1, true)
-{
-	add (_("Mastered luminance (e.g. 14fl)"), true);
-	_mastered_luminance = add (new wxTextCtrl (this, wxID_ANY));
-
-	_mastered_luminance->SetValue (std_to_wx (dm.mastered_luminance));
-
-	layout ();
-}
-
-
-ISDCFMetadata
-ISDCFMetadataDialog::isdcf_metadata () const
-{
-	ISDCFMetadata dm;
-
-	dm.mastered_luminance = wx_to_std (_mastered_luminance->GetValue ());
-
-	return dm;
-}
diff --git a/src/wx/isdcf_metadata_dialog.h b/src/wx/isdcf_metadata_dialog.h
deleted file mode 100644
index 1eb7c8693..000000000
--- a/src/wx/isdcf_metadata_dialog.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "table_dialog.h"
-#include "lib/isdcf_metadata.h"
-#include <wx/textctrl.h>
-
-class wxSpinCtrl;
-class Film;
-
-class ISDCFMetadataDialog : public TableDialog
-{
-public:
-	ISDCFMetadataDialog (wxWindow *, ISDCFMetadata);
-
-	ISDCFMetadata isdcf_metadata () const;
-
-private:
-	wxTextCtrl* _mastered_luminance;
-};
diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc
index c6d28922b..c0e543b34 100644
--- a/src/wx/metadata_dialog.cc
+++ b/src/wx/metadata_dialog.cc
@@ -27,6 +27,7 @@
 #include <boost/bind.hpp>
 #include <boost/weak_ptr.hpp>
 #include <wx/notebook.h>
+#include <wx/spinctrl.h>
 #include <wx/wx.h>
 
 
@@ -84,6 +85,9 @@ MetadataDialog::setup ()
 	_pre_release->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::pre_release_changed, this));
 	_red_band->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::red_band_changed, this));
 	_two_d_version_of_three_d->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::two_d_version_of_three_d_changed, this));
+	_enable_luminance->Bind (wxEVT_CHECKBOX, boost::bind(&MetadataDialog::enable_luminance_changed, this));
+	_luminance_value->Bind (wxEVT_SPINCTRLDOUBLE, boost::bind(&MetadataDialog::luminance_changed, this));
+	_luminance_unit->Bind (wxEVT_CHOICE, boost::bind(&MetadataDialog::luminance_changed, this));
 
 	_film_changed_connection = film()->Change.connect(boost::bind(&MetadataDialog::film_changed, this, _1, _2));
 
@@ -95,6 +99,7 @@ MetadataDialog::setup ()
 	film_changed (ChangeType::DONE, Film::Property::RED_BAND);
 	film_changed (ChangeType::DONE, Film::Property::TWO_D_VERSION_OF_THREE_D);
 	film_changed (ChangeType::DONE, Film::Property::CHAIN);
+	film_changed (ChangeType::DONE, Film::Property::LUMINANCE);
 
 	setup_sensitivity ();
 }
@@ -137,6 +142,20 @@ MetadataDialog::film_changed (ChangeType type, Film::Property property)
 		checked_set (_red_band, film()->red_band());
 	} else if (property == Film::Property::TWO_D_VERSION_OF_THREE_D) {
 		checked_set (_two_d_version_of_three_d, film()->two_d_version_of_three_d());
+	} else if (property == Film::Property::LUMINANCE) {
+		auto lum = film()->luminance();
+		checked_set (_enable_luminance, static_cast<bool>(lum));
+		if (lum) {
+			checked_set (_luminance_value, lum->value());
+			switch (lum->unit()) {
+			case dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE:
+				checked_set (_luminance_unit, 0);
+				break;
+			case dcp::Luminance::Unit::FOOT_LAMBERT:
+				checked_set (_luminance_unit, 1);
+				break;
+			}
+		}
 	}
 }
 
@@ -181,6 +200,8 @@ MetadataDialog::setup_sensitivity ()
 	_facility->Enable (_enable_facility->GetValue());
 	_chain->Enable (_enable_chain->GetValue());
 	_studio->Enable (_enable_studio->GetValue());
+	_luminance_value->Enable (_enable_luminance->GetValue());
+	_luminance_unit->Enable (_enable_luminance->GetValue());
 }
 
 
@@ -229,6 +250,23 @@ MetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
 	_two_d_version_of_three_d = new wxCheckBox (panel, wxID_ANY, _("2D version of 3D DCP"));
 	sizer->Add (_two_d_version_of_three_d, 0, wxALIGN_CENTER_VERTICAL);
 	sizer->AddSpacer (0);
+
+	_enable_luminance = new wxCheckBox (panel, wxID_ANY, _("Luminance"));
+	sizer->Add (_enable_luminance, 0, wxALIGN_CENTER_VERTICAL);
+	{
+		auto s = new wxBoxSizer (wxHORIZONTAL);
+		_luminance_value = new wxSpinCtrlDouble (panel, wxID_ANY);
+		_luminance_value->SetDigits (1);
+		_luminance_value->SetIncrement (0.1);
+		s->Add (_luminance_value, 0);
+		_luminance_unit = new wxChoice (panel, wxID_ANY);
+		s->Add (_luminance_unit, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
+		sizer->Add (s, 1, wxEXPAND);
+	}
+
+	_luminance_unit->Append (wxString::FromUTF8(_("candela per m²")));
+	_luminance_unit->Append (_("foot lambert"));
+
 }
 
 
@@ -310,10 +348,40 @@ MetadataDialog::enable_chain_changed ()
 {
 	setup_sensitivity ();
 	if (_enable_chain->GetValue()) {
-		film()->set_chain (wx_to_std(_chain->GetValue()));
+		chain_changed ();
 	} else {
 		film()->set_chain ();
 	}
 }
 
 
+void
+MetadataDialog::enable_luminance_changed ()
+{
+	setup_sensitivity ();
+	if (_enable_luminance->GetValue()) {
+		luminance_changed ();
+	} else {
+		film()->set_luminance ();
+	}
+}
+
+
+void
+MetadataDialog::luminance_changed ()
+{
+	dcp::Luminance::Unit unit;
+	switch (_luminance_unit->GetSelection()) {
+	case 0:
+		unit = dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE;
+		break;
+	case 1:
+		unit = dcp::Luminance::Unit::FOOT_LAMBERT;
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	film()->set_luminance (dcp::Luminance(_luminance_value->GetValue(), unit));
+}
+
diff --git a/src/wx/metadata_dialog.h b/src/wx/metadata_dialog.h
index 3ac5d10a3..7c4471e59 100644
--- a/src/wx/metadata_dialog.h
+++ b/src/wx/metadata_dialog.h
@@ -33,6 +33,7 @@ DCPOMATIC_ENABLE_WARNINGS
 
 
 class Button;
+class wxSpinCtrlDouble;
 
 
 class MetadataDialog : public wxDialog, public WeakFilm
@@ -61,6 +62,8 @@ private:
 	void two_d_version_of_three_d_changed ();
 	void chain_changed ();
 	void enable_chain_changed ();
+	void enable_luminance_changed ();
+	void luminance_changed ();
 
 	wxCheckBox* _enable_release_territory;
 	/** The current release territory displayed in the UI; since we can't easily convert
@@ -80,6 +83,9 @@ private:
 	wxCheckBox* _pre_release;
 	wxCheckBox* _red_band;
 	wxCheckBox* _two_d_version_of_three_d;
+	wxCheckBox* _enable_luminance;
+	wxSpinCtrlDouble* _luminance_value;
+	wxChoice* _luminance_unit;
 
 	boost::signals2::scoped_connection _film_changed_connection;
 };
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index c32e892d9..3c480e37e 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -28,7 +28,6 @@
 #include "filter_dialog.h"
 #include "file_picker_ctrl.h"
 #include "dir_picker_ctrl.h"
-#include "isdcf_metadata_dialog.h"
 #include "server_dialog.h"
 #include "make_chain_dialog.h"
 #include "email_dialog.h"
diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 3bc676052..e4d2d9622 100644
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -115,18 +115,6 @@ SMPTEMetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
 	_distributor = new wxTextCtrl (panel, wxID_ANY);
 	sizer->Add (_distributor, 1, wxEXPAND);
 
-	add_label_to_sizer (sizer, panel, _("Luminance"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
-	{
-		auto s = new wxBoxSizer (wxHORIZONTAL);
-		_luminance_value = new wxSpinCtrlDouble (panel, wxID_ANY);
-		_luminance_value->SetDigits (1);
-		_luminance_value->SetIncrement (0.1);
-		s->Add (_luminance_value, 0);
-		_luminance_unit = new wxChoice (panel, wxID_ANY);
-		s->Add (_luminance_unit, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
-		sizer->Add (s, 1, wxEXPAND);
-	}
-
 	{
 		int flags = wxALIGN_TOP | wxRIGHT | wxTOP;
 #ifdef __WXOSX__
@@ -167,23 +155,17 @@ SMPTEMetadataDialog::setup ()
 	_status->Append (_("Pre-release"));
 	_status->Append (_("Final"));
 
-	_luminance_unit->Append (wxString::FromUTF8(_("candela per m²")));
-	_luminance_unit->Append (_("foot lambert"));
-
 	_name_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::name_language_changed, this, _1));
 	_version_number->Bind (wxEVT_SPINCTRL, boost::bind(&SMPTEMetadataDialog::version_number_changed, this));
 	_status->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::status_changed, this));
 	_enable_distributor->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_distributor_changed, this));
 	_distributor->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::distributor_changed, this));
-	_luminance_value->Bind (wxEVT_SPINCTRLDOUBLE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
-	_luminance_unit->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
 
 	film_changed (ChangeType::DONE, Film::Property::NAME_LANGUAGE);
 	film_changed (ChangeType::DONE, Film::Property::VERSION_NUMBER);
 	film_changed (ChangeType::DONE, Film::Property::STATUS);
 	film_changed (ChangeType::DONE, Film::Property::DISTRIBUTOR);
 	film_changed (ChangeType::DONE, Film::Property::CONTENT_VERSIONS);
-	film_changed (ChangeType::DONE, Film::Property::LUMINANCE);
 
 	setup_sensitivity ();
 }
@@ -219,22 +201,6 @@ SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
 		if (film()->distributor()) {
 			checked_set (_distributor, *film()->distributor());
 		}
-	} else if (property == Film::Property::LUMINANCE) {
-		auto lum = film()->luminance();
-		if (lum) {
-			checked_set (_luminance_value, lum->value());
-			switch (lum->unit()) {
-			case dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE:
-				checked_set (_luminance_unit, 0);
-				break;
-			case dcp::Luminance::Unit::FOOT_LAMBERT:
-				checked_set (_luminance_unit, 1);
-				break;
-			}
-		} else {
-			checked_set (_luminance_value, 4.5);
-			checked_set (_luminance_unit, 1);
-		}
 	}
 }
 
@@ -306,25 +272,6 @@ SMPTEMetadataDialog::distributor_changed ()
 
 
 void
-SMPTEMetadataDialog::luminance_changed ()
-{
-	dcp::Luminance::Unit unit;
-	switch (_luminance_unit->GetSelection()) {
-	case 0:
-		unit = dcp::Luminance::Unit::CANDELA_PER_SQUARE_METRE;
-		break;
-	case 1:
-		unit = dcp::Luminance::Unit::FOOT_LAMBERT;
-		break;
-	default:
-		DCPOMATIC_ASSERT (false);
-	}
-
-	film()->set_luminance (dcp::Luminance(_luminance_value->GetValue(), unit));
-}
-
-
-void
 SMPTEMetadataDialog::setup_sensitivity ()
 {
 	MetadataDialog::setup_sensitivity ();
diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index acf1ac111..d1a792a36 100644
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -58,7 +58,6 @@ private:
 	void version_number_changed ();
 	void status_changed ();
 	void distributor_changed ();
-	void luminance_changed ();
 	void enable_distributor_changed ();
 
 	LanguageTagWidget* _name_language;
@@ -66,8 +65,6 @@ private:
 	wxChoice* _status;
 	wxCheckBox* _enable_distributor;
 	wxTextCtrl* _distributor;
-	wxSpinCtrlDouble* _luminance_value;
-	wxChoice* _luminance_unit;
 	EditableList<dcp::Rating, RatingDialog>* _ratings;
 	EditableList<std::string, ContentVersionDialog>* _content_versions;
 };
diff --git a/src/wx/wscript b/src/wx/wscript
index 013377e16..1d0fb0810 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -85,7 +85,6 @@ sources = """
           image_sequence_dialog.cc
           instant_i18n_dialog.cc
           interop_metadata_dialog.cc
-          isdcf_metadata_dialog.cc
           job_manager_view.cc
           job_view.cc
           job_view_dialog.cc