Merge master.

[libdcp.git] / src / mxf_asset.h

diff --git a/src/mxf_asset.h b/src/mxf_asset.h
index ff43fecb60a224ab59bfabcd079e1b229c5bdb66..a23a052dafd91643b3c533eb22738a2b9efd06ea 100644 (file)
--- a/src/mxf_asset.h
+++ b/src/mxf_asset.h
@@ -23,56 +23,59 @@
 #include <boost/signals2.hpp>
 #include "asset.h"
 
+namespace ASDCP {
+       class AESEncContext;
+}
+
 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 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 intrinsic_duration);
-
-       void set_entry_point (int e);
-       void set_duration (int d);
+       MXFAsset (std::string directory, std::string file_name, boost::signals2::signal<void (float)>* progress, int edit_rate, int intrinsic_duration, bool encrypted);
 
-       virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
-       
-       int intrinsic_duration () const;
-       int frames_per_second () const {
-               return _fps;
-       }
+       ~MXFAsset ();
 
-       void set_intrinsic_duration (int d) {
-               _intrinsic_duration = d;
-       }
+       virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
 
        /** Fill in a ADSCP::WriteInfo struct.
         *  @param w struct to fill in.
         *  @param uuid uuid to use.
         */
-       static void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid);
+       void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, MXFMetadata const & metadata);
 
+       void add_typed_key_id (xmlpp::Element *) const;
+       
 protected:
-
-       /** Signal to emit to report progress */
+       virtual std::string key_type () const = 0;
+       
+       /** Signal to emit to report progress, or 0 */
        boost::signals2::signal<void (float)>* _progress;
-       /** Frames per second */
-       int _fps;
-       /** Start point to present in frames */
-       int _entry_point;
-       /** Total length in frames */
-       int _intrinsic_duration;
-       /** Length to present in frames */
-       int _duration;
+       bool _encrypted;
+       ASDCP::AESEncContext* _encryption_context;
+       std::string _key_value;
+       std::string _key_id;
 };
 
 }