Merge master.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 6750e0e98cb5606fa154c15e7f1cbc0a861759b1..0fdb1fe5051eda24adf941bde7eeafbc287ddddf 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -159,6 +159,14 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
        
        table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 
+       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");
+       table->Add (_type, 1, wxEXPAND);
+       _type->SetSelection (0);
+
        _write_to = new wxRadioButton (this, wxID_ANY, _("Write to"));
        table->Add (_write_to, 1, wxEXPAND);
 
@@ -480,6 +488,21 @@ KDMDialog::write_to () const
        return _write_to->GetValue ();
 }
 
+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);
+       }
+}
+
 void
 KDMDialog::update_cpl_choice ()
 {