Use studio and facility from Interop/SMPTE metadata rather than ISDCF.

[dcpomatic.git] / src / wx / smpte_metadata_dialog.cc

diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 857be282c8ba75a0917d11185047672c89f6d81a..37a957921808c0988a314e743cd54bbbcbd66872 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -120,11 +120,6 @@ SMPTEMetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
        _distributor = new wxTextCtrl (panel, wxID_ANY);
        sizer->Add (_distributor, 1, wxEXPAND);
 
-       _enable_facility = new wxCheckBox (panel, wxID_ANY, _("Facility"));
-       sizer->Add (_enable_facility, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
-       _facility = new wxTextCtrl (panel, wxID_ANY);
-       sizer->Add (_facility, 1, wxEXPAND);
-
        add_label_to_sizer (sizer, panel, _("Luminance"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
        {
                auto s = new wxBoxSizer (wxHORIZONTAL);
@@ -187,8 +182,6 @@ SMPTEMetadataDialog::setup ()
        _chain->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::chain_changed, this));
        _enable_distributor->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_distributor_changed, this));
        _distributor->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::distributor_changed, this));
-       _enable_facility->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_facility_changed, this));
-       _facility->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::facility_changed, this));
        _luminance_value->Bind (wxEVT_SPINCTRLDOUBLE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
        _luminance_unit->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
 
@@ -197,7 +190,6 @@ SMPTEMetadataDialog::setup ()
        film_changed (ChangeType::DONE, Film::Property::STATUS);
        film_changed (ChangeType::DONE, Film::Property::CHAIN);
        film_changed (ChangeType::DONE, Film::Property::DISTRIBUTOR);
-       film_changed (ChangeType::DONE, Film::Property::FACILITY);
        film_changed (ChangeType::DONE, Film::Property::CONTENT_VERSIONS);
        film_changed (ChangeType::DONE, Film::Property::LUMINANCE);
 
@@ -240,11 +232,6 @@ SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
                if (film()->distributor()) {
                        checked_set (_distributor, *film()->distributor());
                }
-       } else if (property == Film::Property::FACILITY) {
-               checked_set (_enable_facility, static_cast<bool>(film()->facility()));
-               if (film()->facility()) {
-                       checked_set (_facility, *film()->facility());
-               }
        } else if (property == Film::Property::LUMINANCE) {
                auto lum = film()->luminance();
                if (lum) {
@@ -338,13 +325,6 @@ SMPTEMetadataDialog::distributor_changed ()
 }
 
 
-void
-SMPTEMetadataDialog::facility_changed ()
-{
-       film()->set_facility (wx_to_std(_facility->GetValue()));
-}
-
-
 void
 SMPTEMetadataDialog::luminance_changed ()
 {
@@ -371,7 +351,6 @@ SMPTEMetadataDialog::setup_sensitivity ()
 
        _chain->Enable (_enable_chain->GetValue());
        _distributor->Enable (_enable_distributor->GetValue());
-       _facility->Enable (_enable_facility->GetValue());
 }
 
 
@@ -399,15 +378,3 @@ SMPTEMetadataDialog::enable_distributor_changed ()
 }
 
 
-void
-SMPTEMetadataDialog::enable_facility_changed ()
-{
-       setup_sensitivity ();
-       if (_enable_facility->GetValue()) {
-               film()->set_facility (wx_to_std(_facility->GetValue()));
-       } else {
-               film()->set_facility ();
-       }
-}
-
-