Merge master.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 8df94de9c5f06a986213d479d56e5463d83df51d..0fdb1fe5051eda24adf941bde7eeafbc287ddddf 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -488,16 +488,16 @@ KDMDialog::write_to () const
        return _write_to->GetValue ();
 }
 
-libdcp::KDM::Formulation
+dcp::Formulation
 KDMDialog::formulation () const
 {
        switch (_type->GetSelection()) {
        case 0:
-               return libdcp::KDM::MODIFIED_TRANSITIONAL_1;
+               return dcp::MODIFIED_TRANSITIONAL_1;
        case 1:
-               return libdcp::KDM::DCI_ANY;
+               return dcp::DCI_ANY;
        case 2:
-               return libdcp::KDM::DCI_SPECIFIC;
+               return dcp::DCI_SPECIFIC;
        default:
                assert (false);
        }