From 76e3325a16cdf6d7220a61e2b5cfdb9c804cc32c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Jan 2021 01:57:06 +0100 Subject: Use enum class for the things in types.h --- src/decrypted_kdm.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/decrypted_kdm.cc') diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index dd6def32..10da80e6 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -178,7 +178,7 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key) /* 93 is not-valid-after (a string) [25 bytes] */ p += 25; /* 118 is the key [ASDCP::KeyLen bytes] */ - add_key (optional(), key_id, Key (p), cpl_id, INTEROP); + add_key (optional(), key_id, Key(p), cpl_id, Standard::INTEROP); break; } case 138: @@ -200,7 +200,7 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key) /* 97 is not-valid-after (a string) [25 bytes] */ p += 25; /* 112 is the key [ASDCP::KeyLen bytes] */ - add_key (key_type, key_id, Key (p), cpl_id, SMPTE); + add_key (key_type, key_id, Key(p), cpl_id, Standard::SMPTE); break; } default: @@ -250,7 +250,7 @@ DecryptedKDM::DecryptedKDM ( , _issue_date (issue_date) { for (map, Key>::const_iterator i = keys.begin(); i != keys.end(); ++i) { - add_key (i->first->key_type(), i->first->key_id().get(), i->second, cpl_id, SMPTE); + add_key (i->first->key_type(), i->first->key_id().get(), i->second, cpl_id, Standard::SMPTE); } } @@ -271,9 +271,9 @@ DecryptedKDM::DecryptedKDM ( { /* Create DecryptedKDMKey objects for each encryptable asset */ bool did_one = false; - BOOST_FOREACH(shared_ptr i, cpl->reel_mxfs()) { + for (auto i: cpl->reel_mxfs()) { if (i->key_id()) { - add_key (i->key_type(), i->key_id().get(), key, cpl->id(), SMPTE); + add_key (i->key_type(), i->key_id().get(), key, cpl->id(), Standard::SMPTE); did_one = true; } } -- cgit v1.2.3