diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-16 11:14:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-16 11:14:54 +0100 |
| commit | 9e4c091e6ef0f79fab10664e95240de2f14e5702 (patch) | |
| tree | 0929399880e571b1ac4e30abd286958fb0a67361 /src/wx/kdm_dialog.cc | |
| parent | ea8c3dca0730a3e50a7b2788a4b79c4b521cef4b (diff) | |
| parent | 5598e0dfbae48463130323c6a3bcd3eb9683f21e (diff) | |
Merge master.
Diffstat (limited to 'src/wx/kdm_dialog.cc')
| -rw-r--r-- | src/wx/kdm_dialog.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 0fdb1fe50..6ef630eff 100644 --- 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 |