projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for writing 3D CPLs.
[libdcp.git]
/
src
/
mxf_asset.h
diff --git
a/src/mxf_asset.h
b/src/mxf_asset.h
index a23a052dafd91643b3c533eb22738a2b9efd06ea..763f405bdf687c2f52b894dcc2cb43cfc06b1372 100644
(file)
--- a/
src/mxf_asset.h
+++ b/
src/mxf_asset.h
@@
-25,12
+25,14
@@
namespace ASDCP {
class AESEncContext;
namespace ASDCP {
class AESEncContext;
+ class AESDecContext;
}
namespace libdcp
{
class MXFMetadata;
}
namespace libdcp
{
class MXFMetadata;
+class KDMCipher;
/** @brief Parent class for assets which have MXF files */
class MXFAsset : public Asset
/** @brief Parent class for assets which have MXF files */
class MXFAsset : public Asset
@@
-59,6
+61,8
@@
public:
virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
+ virtual void write_to_cpl (xmlpp::Node *) const;
+
/** Fill in a ADSCP::WriteInfo struct.
* @param w struct to fill in.
* @param uuid uuid to use.
/** Fill in a ADSCP::WriteInfo struct.
* @param w struct to fill in.
* @param uuid uuid to use.
@@
-66,9
+70,24
@@
public:
void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, MXFMetadata const & metadata);
void add_typed_key_id (xmlpp::Element *) const;
void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, MXFMetadata const & metadata);
void add_typed_key_id (xmlpp::Element *) const;
+
+ std::string key_id () const {
+ return _key_id;
+ }
+
+ void set_key_id (std::string k) {
+ _key_id = k;
+ }
+
+ bool encrypted () const {
+ return !_key_id.empty ();
+ }
+
+ void set_kdm_cipher (KDMCipher);
protected:
virtual std::string key_type () const = 0;
protected:
virtual std::string key_type () const = 0;
+ virtual std::string cpl_node_name () const = 0;
/** Signal to emit to report progress, or 0 */
boost::signals2::signal<void (float)>* _progress;
/** Signal to emit to report progress, or 0 */
boost::signals2::signal<void (float)>* _progress;
@@
-76,6
+95,7
@@
protected:
ASDCP::AESEncContext* _encryption_context;
std::string _key_value;
std::string _key_id;
ASDCP::AESEncContext* _encryption_context;
std::string _key_value;
std::string _key_id;
+ ASDCP::AESDecContext* _decryption_context;
};
}
};
}