diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-06-12 21:04:52 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-06-12 21:04:52 +0200 |
| commit | 5ccfb74647db6917c054d6d67f91ed5a74e397ba (patch) | |
| tree | 47b28d0f31d5d3c0aa7351f0e5125d74744063d1 | |
| parent | 58f73422b75059b5e12e229da14c885076956153 (diff) | |
Offer all KDM types no matter what standard is in use.
A user reports that on a Barco system they needed to use a
"DCI Specific" KDM with an Interop DCP.
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 3 | ||||
| -rw-r--r-- | src/wx/kdm_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 8 | ||||
| -rw-r--r-- | src/wx/kdm_output_panel.h | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 965ba7a0f..4d84f2f33 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -180,8 +180,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - /* XXX: hard-coded non-interop here */ - _output = new KDMOutputPanel (overall_panel, false); + _output = new KDMOutputPanel (overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); _create = new Button (overall_panel, _("Create KDMs")); diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index c44321ac5..9b6b0927c 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -108,7 +108,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film) h = new StaticText (this, _("Output")); h->SetFont (subheading_font); right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - _output = new KDMOutputPanel (this, film->interop ()); + _output = new KDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); _make = new Button (this, _("Make KDMs")); diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 0147a0b8a..6aa0d878f 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -55,7 +55,7 @@ using namespace boost::placeholders; #endif -KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) +KDMOutputPanel::KDMOutputPanel (wxWindow* parent) : wxPanel (parent, wxID_ANY) , _forensic_mark_video (true) , _forensic_mark_audio (true) @@ -69,12 +69,10 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL); _type = new wxChoice (this, wxID_ANY); _type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1)); + _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY)); + _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC)); _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1)); _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST)); - if (!interop) { - _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY)); - _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC)); - } type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); _type->SetSelection (0); wxButton* advanced = new Button (this, _("Advanced...")); diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index b01913354..e8515d2c6 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -35,7 +35,7 @@ class Log; class KDMOutputPanel : public wxPanel { public: - KDMOutputPanel (wxWindow* parent, bool interop); + KDMOutputPanel (wxWindow* parent); void setup_sensitivity (); |