diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
| commit | 0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch) | |
| tree | 075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /src/wx/kdm_dialog.cc | |
| parent | 42a122334d594b824c666e5263168386a76801cc (diff) | |
| parent | 016a98b18d01276a1e603885a25785e7389f14d9 (diff) | |
Merge branch 'master' into 12bit
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 8df94de9c..ebecd234c 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 libdcp::KDM::Formulation KDMDialog::formulation () const { - switch (_type->GetSelection()) { - case 0: - return libdcp::KDM::MODIFIED_TRANSITIONAL_1; - case 1: - return libdcp::KDM::DCI_ANY; - case 2: - return libdcp::KDM::DCI_SPECIFIC; - default: - assert (false); - } + return (libdcp::KDM::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection())); } void |