X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=6aa0d878f668ba4d45ea7a02abaa34d365e435de;hb=c76a7e968f54eb0e6c8da9c1ae6bc069ed05fdda;hp=0147a0b8a38486df4280f85a1eae2b658ad8bf5c;hpb=cab4c177cd68fb1c81027450cbcd422876f92fb2;p=dcpomatic.git 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..."));