Merge master.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 0fdb1fe5051eda24adf941bde7eeafbc287ddddf..6ef630eff39f5a29cb39a88ed7cb8952e8698d26 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -161,9 +161,11 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
        add_label_to_sizer (table, this, _("KDM type"), true);
        _type = new wxChoice (this, wxID_ANY);
-       _type->Append ("Modified Transitional 1");
-       _type->Append ("DCI Any");
-       _type->Append ("DCI Specific");
+       _type->Append ("Modified Transitional 1", ((void *) libdcp::KDM::MODIFIED_TRANSITIONAL_1));
+       if (!film->interop ()) {
+               _type->Append ("DCI Any", ((void *) libdcp::KDM::DCI_ANY));
+               _type->Append ("DCI Specific", ((void *) libdcp::KDM::DCI_SPECIFIC));
+       }
        table->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
 
@@ -491,16 +493,7 @@ KDMDialog::write_to () const
 dcp::Formulation
 KDMDialog::formulation () const
 {
-       switch (_type->GetSelection()) {
-       case 0:
-               return dcp::MODIFIED_TRANSITIONAL_1;
-       case 1:
-               return dcp::DCI_ANY;
-       case 2:
-               return dcp::DCI_SPECIFIC;
-       default:
-               assert (false);
-       }
+       return (dcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
 }
 
 void