diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 02:44:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 20:15:14 +0100 |
| commit | 28111007e2e6fd62f5810be780706ae1618bd33f (patch) | |
| tree | d99fe830ba961b174d3f024d2b5671a9821ed8a9 /src/tools | |
| parent | c7d77490382d6ddb625340c05b57487cde244f96 (diff) | |
Adapt for libdcp use of enum class.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_create.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 0db26566a..78466d25b 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -939,7 +939,7 @@ private: vector<string>(), d->cpl (), from, to, - dcp::MODIFIED_TRANSITIONAL_1, + dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0 ); diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 1d3387f18..a2d5c8e5d 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -99,7 +99,7 @@ main (int argc, char* argv[]) film->set_container (cc.container_ratio); } film->set_dcp_content_type (cc.dcp_content_type); - film->set_interop (cc.standard == dcp::INTEROP); + film->set_interop (cc.standard == dcp::Standard::INTEROP); film->set_use_isdcf_name (!cc.no_use_isdcf_name); film->set_encrypted (cc.encrypt); film->set_three_d (cc.threed); diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index d0ee0cad9..f21772a4d 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -407,7 +407,7 @@ int main (int argc, char* argv[]) bool list_dkdm_cpls = false; optional<string> duration_string; bool verbose = false; - dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1; + dcp::Formulation formulation = dcp::Formulation::MODIFIED_TRANSITIONAL_1; bool disable_forensic_marking_picture = false; optional<int> disable_forensic_marking_audio; @@ -467,13 +467,13 @@ int main (int argc, char* argv[]) break; case 'F': if (string (optarg) == "modified-transitional-1") { - formulation = dcp::MODIFIED_TRANSITIONAL_1; + formulation = dcp::Formulation::MODIFIED_TRANSITIONAL_1; } else if (string (optarg) == "multiple-modified-transitional-1") { - formulation = dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1; + formulation = dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1; } else if (string (optarg) == "dci-any") { - formulation = dcp::DCI_ANY; + formulation = dcp::Formulation::DCI_ANY; } else if (string (optarg) == "dci-specific") { - formulation = dcp::DCI_SPECIFIC; + formulation = dcp::Formulation::DCI_SPECIFIC; } else { error ("unrecognised KDM formulation " + string (optarg)); } |