diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-24 04:15:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-24 04:15:26 +0100 |
| commit | ceaf7bc52712cb60708ed5eb5c62c5e463dd8e89 (patch) | |
| tree | c55e4b85ee30138ce83263045d77d01631378b2e /src/cpl.cc | |
| parent | 6c37cc1979b2a01205a888c4c98f3334685ee8dd (diff) | |
Tidying.
Diffstat (limited to 'src/cpl.cc')
| -rw-r--r-- | src/cpl.cc | 29 |
1 files changed, 12 insertions, 17 deletions
@@ -31,6 +31,12 @@ files in the program, then also delete it here. */ + +/** @file src/cpl.cc + * @brief CPL class + */ + + #include "cpl.h" #include "util.h" #include "reel.h" @@ -51,6 +57,7 @@ #include <libxml++/libxml++.h> #include <boost/algorithm/string.hpp> + using std::string; using std::list; using std::pair; @@ -86,7 +93,7 @@ CPL::CPL (string annotation_text, ContentKind content_kind) _content_versions.push_back (cv); } -/** Construct a CPL object from a XML file */ + CPL::CPL (boost::filesystem::path file) : Asset (file) , _content_kind (ContentKind::FEATURE) @@ -143,7 +150,6 @@ CPL::CPL (boost::filesystem::path file) } } - f.ignore_child ("Issuer"); f.ignore_child ("Signer"); f.ignore_child ("Signature"); @@ -151,21 +157,14 @@ CPL::CPL (boost::filesystem::path file) f.done (); } -/** Add a reel to this CPL. - * @param reel Reel to add. - */ + void CPL::add (std::shared_ptr<Reel> reel) { _reels.push_back (reel); } -/** Write an CompositonPlaylist XML file. - * - * @param file Filename to write. - * @param standard INTEROP or SMPTE. - * @param signer Signer to sign the CPL, or 0 to add no signature. - */ + void CPL::write_xml (boost::filesystem::path file, Standard standard, shared_ptr<const CertificateChain> signer) const { @@ -544,6 +543,7 @@ CPL::reel_mxfs () const return c; } + bool CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const { @@ -582,7 +582,7 @@ CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler not return true; } -/** @return true if we have any encrypted content */ + bool CPL::any_encrypted () const { @@ -596,7 +596,6 @@ CPL::any_encrypted () const } -/** @return true if we have all our encryptable content is encrypted */ bool CPL::all_encrypted () const { @@ -610,10 +609,6 @@ CPL::all_encrypted () const } -/** Add a KDM to this CPL. If the KDM is for any of this CPLs assets it will be used - * to decrypt those assets. - * @param kdm KDM. - */ void CPL::add (DecryptedKDM const & kdm) { |