X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmxf_asset.h;h=d681970eb24291281c22944753ead1c577127792;hb=30e2f6f873002d16aeae707879ea15c1c63a4323;hp=93fa901304d4de9c1bc423766e8e4819173f1515;hpb=ed6a471b61d36a3ba7e8696fa3e5606406c5cf62;p=libdcp.git

diff --git a/src/mxf_asset.h b/src/mxf_asset.h
index 93fa9013..d681970e 100644
--- a/src/mxf_asset.h
+++ b/src/mxf_asset.h
@@ -22,57 +22,93 @@
 
 #include <boost/signals2.hpp>
 #include "asset.h"
+#include "key.h"
 
 namespace ASDCP {
 	class AESEncContext;
+	class AESDecContext;
 }
 
 namespace libdcp
 {
 
+class MXFMetadata;	
+
 /** @brief Parent class for assets which have MXF files */	
 class MXFAsset : public Asset
 {
 public:
 	/** Construct an MXFAsset.
+	 *  This class will not write anything to disk in this constructor, but subclasses may.
+	 *
+	 *  @param directory Directory where MXF file is.
+	 *  @param file_name Name of MXF file.
+	 */
+	MXFAsset (std::string directory, std::string file_name);
+	
+	/** Construct an MXFAsset.
+	 *  This class will not write anything to disk in this constructor, but subclasses may.
+	 *
 	 *  @param directory Directory where MXF file is.
 	 *  @param file_name Name of MXF file.
-	 *  @param progress Signal to inform of progress.
-	 *  @param fps Frames per second.
-	 *  @param entry_point The entry point of this MXF; ie the first frame that should be used.
-	 *  @param length Length in frames.
-	 *  @param encrypted true if the MXF should be encrypted.
+	 *  @param progress Signal to use to inform of progress, or 0.
+	 *  @param edit_rate Edit rate in frames per second (usually equal to the video frame rate).
+	 *  @param intrinsic_duration Duration of the whole asset in frames.
 	 */
 	MXFAsset (
-		std::string directory, std::string file_name, boost::signals2::signal<void (float)>* progress, int fps, int entry_point, int length, bool encrypted
+		std::string directory,
+		std::string file_name,
+		boost::signals2::signal<void (float)>* progress,
+		int edit_rate,
+		int intrinsic_duration
 		);
 
 	~MXFAsset ();
 
-	virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
-	
-	int length () const;
-	void add_typed_key_id (xmlpp::Element *) 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::Element *, bool interop) const;
 
-protected:
-	virtual std::string key_type () const = 0;
-	
 	/** Fill in a ADSCP::WriteInfo struct.
 	 *  @param w struct to fill in.
+	 *  @param uuid uuid to use.
+	 *  @param true to label as interop, false for SMPTE.
 	 */
-	void fill_writer_info (ASDCP::WriterInfo* w) const;
+	void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, bool interop, MXFMetadata const & metadata);
+
+	void add_typed_key_id (xmlpp::Element *) const;
 
-	/** Signal to emit to report progress */
+	bool encrypted () const {
+		return !_key_id.empty ();
+	}
+
+	void set_key_id (std::string i) {
+		_key_id = i;
+	}
+
+	std::string key_id () const {
+		return _key_id;
+	}
+	
+	void set_key (Key);
+
+	boost::optional<Key> key () const {
+		return _key;
+	}
+	
+protected:
+	virtual std::string key_type () const = 0;
+	virtual std::string cpl_node_name () const = 0;
+	virtual std::pair<std::string, std::string> cpl_node_attribute (bool) const {
+		return std::make_pair ("", "");
+	}
+	
+	/** Signal to emit to report progress, or 0 */
 	boost::signals2::signal<void (float)>* _progress;
-	/** Frames per second */
-	int _fps;
-	int _entry_point;
-	/** Length in frames */
-	int _length;
-	bool _encrypted;
 	ASDCP::AESEncContext* _encryption_context;
-	std::string _key_value;
+	ASDCP::AESDecContext* _decryption_context;
 	std::string _key_id;
+	boost::optional<Key> _key;
 };
 
 }