From 71a358ce70bf9156e895f3dc6515e65628950422 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Feb 2018 23:17:24 +0000 Subject: Adapt for changes to disable_forensic variable types in libdcp. --- src/tools/dcpomatic_kdm_cli.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/tools/dcpomatic_kdm_cli.cc') diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index fbd6bb870..f632d808a 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -194,8 +194,8 @@ from_film ( boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio, + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio, bool zip ) { @@ -277,8 +277,8 @@ kdm_from_dkdm ( dcp::LocalTime valid_from, dcp::LocalTime valid_to, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio ) { /* Signer for new KDM */ @@ -314,8 +314,8 @@ from_dkdm ( boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio, + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio, bool zip ) { @@ -399,8 +399,8 @@ int main (int argc, char* argv[]) optional duration_string; bool verbose = false; dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1; - int disable_forensic_marking_picture = 0; - int disable_forensic_marking_audio = 0; + bool disable_forensic_marking_picture = false; + optional disable_forensic_marking_audio; program_name = argv[0]; @@ -470,13 +470,13 @@ int main (int argc, char* argv[]) } break; case 'p': - disable_forensic_marking_picture = -1; + disable_forensic_marking_picture = true; break; case 'a': - disable_forensic_marking_audio = -1; - if (optarg == NULL && argv[optind] != NULL && argv[optind][0] != '-') { + disable_forensic_marking_audio = 0; + if (optarg == 0 && argv[optind] != 0 && argv[optind][0] != '-') { disable_forensic_marking_audio = atoi (argv[optind++]); - } else if (optarg != NULL) { + } else if (optarg) { disable_forensic_marking_audio = atoi (optarg); } break; -- cgit v1.2.3