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"));
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"));
#endif
-KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
+KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
: wxPanel (parent, wxID_ANY)
, _forensic_mark_video (true)
, _forensic_mark_audio (true)
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..."));
class KDMOutputPanel : public wxPanel
{
public:
- KDMOutputPanel (wxWindow* parent, bool interop);
+ KDMOutputPanel (wxWindow* parent);
void setup_sensitivity ();