diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-04 21:55:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 14:35:31 +0100 |
| commit | 55686953bfecd42fac24bdf2668920954a8173be (patch) | |
| tree | 3de0f280ca9b089c629ffd897bbbc25284ced6e7 /src/decrypted_kdm.cc | |
| parent | 3fd8e16705b3eb4dc08cf9f33a489418b069b90a (diff) | |
Use boost::optional for key id instead of an empty string.
Diffstat (limited to 'src/decrypted_kdm.cc')
| -rw-r--r-- | src/decrypted_kdm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index bf9daa1a..4d9c44a8 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -203,10 +203,10 @@ DecryptedKDM::DecryptedKDM ( /* XXX: do non-MXF assets need keys? */ shared_ptr<const ReelMXFAsset> mxf = boost::dynamic_pointer_cast<const ReelMXFAsset> (i); if (mxf) { - if (mxf->key_id().empty ()) { + if (!mxf->key_id ()) { throw NotEncryptedError (mxf->id()); } - _keys.push_back (DecryptedKDMKey (mxf->key_type(), mxf->key_id(), key, cpl->id ())); + _keys.push_back (DecryptedKDMKey (mxf->key_type(), mxf->key_id().get(), key, cpl->id ())); } } } |