diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-16 11:35:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-16 11:35:49 +0100 |
| commit | a0fa7ae7ddac1afc83c04a39e25fec3f4b942a04 (patch) | |
| tree | 15a7458c861bea59145498937e52a1c759c85b25 | |
| parent | 9e4c091e6ef0f79fab10664e95240de2f14e5702 (diff) | |
Fix mis-merge.
| -rw-r--r-- | src/wx/kdm_dialog.cc | 8 | ||||
| -rw-r--r-- | wscript | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 6ef630eff..4975146ec 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -161,10 +161,10 @@ 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", ((void *) libdcp::KDM::MODIFIED_TRANSITIONAL_1)); + _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); if (!film->interop ()) { - _type->Append ("DCI Any", ((void *) libdcp::KDM::DCI_ANY)); - _type->Append ("DCI Specific", ((void *) libdcp::KDM::DCI_SPECIFIC)); + _type->Append ("DCI Any", ((void *) dcp::DCI_ANY)); + _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC)); } table->Add (_type, 1, wxEXPAND); _type->SetSelection (0); @@ -493,7 +493,7 @@ KDMDialog::write_to () const dcp::Formulation KDMDialog::formulation () const { - return (dcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection())); + return (dcp::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection())); } void @@ -58,11 +58,7 @@ def dynamic_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): -<<<<<<< HEAD - conf.check_cfg(package='libdcp-1.0', atleast_version='0.95', args='--cflags', uselib_store='DCP', mandatory=True) -======= - conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) ->>>>>>> origin/master + conf.check_cfg(package='libdcp-1.0', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] |