diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
| commit | 76e3325a16cdf6d7220a61e2b5cfdb9c804cc32c (patch) | |
| tree | 8c1b5e5dc2cec265469a0d8018b6d7396b089432 /tools | |
| parent | 6c3db78c3d20ef064fa2a0ef38e65ca1ae69adb3 (diff) | |
Use enum class for the things in types.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdiff.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 4 | ||||
| -rw-r--r-- | tools/dcpkdm.cc | 2 | ||||
| -rw-r--r-- | tools/dcprecover.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc index 7da55ccc..a9d78712 100644 --- a/tools/dcpdiff.cc +++ b/tools/dcpdiff.cc @@ -83,7 +83,7 @@ help (string n) void note (NoteType t, string n) { - if (t == DCP_ERROR || verbose) { + if (t == NoteType::ERROR || verbose) { cout << " " << n << "\n"; cout.flush (); } diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index aa1ce8c2..18272dcf 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -143,7 +143,7 @@ main_picture (vector<string> const& only, shared_ptr<Reel> reel, bool analyse, b OUTPUT_PICTURE( " duration %1 (%2) intrinsic %3", *mp->duration(), - dcp::Time(*mp->duration(), mp->frame_rate().as_float(), mp->frame_rate().as_float()).as_string(dcp::SMPTE), + dcp::Time(*mp->duration(), mp->frame_rate().as_float(), mp->frame_rate().as_float()).as_string(dcp::Standard::SMPTE), mp->intrinsic_duration() ); } else { @@ -433,7 +433,7 @@ main (int argc, char* argv[]) } } - OUTPUT_TOTAL_TIME("Total: %1\n", total_time.as_string(dcp::SMPTE)); + OUTPUT_TOTAL_TIME("Total: %1\n", total_time.as_string(dcp::Standard::SMPTE)); return 0; } diff --git a/tools/dcpkdm.cc b/tools/dcpkdm.cc index 7bf06e19..60fcf902 100644 --- a/tools/dcpkdm.cc +++ b/tools/dcpkdm.cc @@ -132,7 +132,7 @@ try BOOST_FOREACH (dcp::DecryptedKDMKey i, dec_kdm.keys ()) { cout << "\n"; cout << "\tID: " << i.id() << "\n"; - cout << "\tStandard: " << (i.standard() == dcp::SMPTE ? "SMPTE" : "Interop") << "\n"; + cout << "\tStandard: " << (i.standard() == dcp::Standard::SMPTE ? "SMPTE" : "Interop") << "\n"; cout << "\tCPL ID: " << i.cpl_id() << "\n"; if (i.type()) { cout << "\tType: " << i.type().get() << "\n"; diff --git a/tools/dcprecover.cc b/tools/dcprecover.cc index 49699f5e..b5790992 100644 --- a/tools/dcprecover.cc +++ b/tools/dcprecover.cc @@ -156,7 +156,7 @@ main (int argc, char* argv[]) dcp::DCP fixed (*output); fixed.add (cpl); fixed.resolve_refs (assets); - fixed.write_xml (dcp::INTEROP); + fixed.write_xml (dcp::Standard::INTEROP); cout << "Fixed XML files written to " << output->string() << "\n"; } |