Bump version

[libdcp.git] / src / mxf.h

diff --git a/src/mxf.h b/src/mxf.h
index 525ac701c1b0542d13dfc57b63cc8da35a08f49b..f8be98446f4516ba8d1166bca5be7a965a65c94b 100644 (file)
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -20,49 +20,39 @@
 #ifndef LIBDCP_MXF_H
 #define LIBDCP_MXF_H
 
-#include "content.h"
+#include "asset.h"
 #include "key.h"
 #include "metadata.h"
+
 #include <boost/signals2.hpp>
 
 namespace ASDCP {
-       class AESEncContext;
        class AESDecContext;
+       class WriterInfo;
 }
 
+/* Undefine some stuff that the OS X 10.5 SDK defines */
+#undef Key
+#undef set_key
+
 namespace dcp
 {
 
-class MXFMetadata;     
+class MXFMetadata;
+class PictureAssetWriter;
 
 /** @class MXF
- *  @brief Parent class for classes which represent MXF files.
+ *  @brief Parent for classes which represent MXF files.
  */
-class MXF : public Content
+class MXF
 {
 public:
-       MXF (Fraction edit_rate);
-       MXF (boost::filesystem::path file);
-       ~MXF ();
-
-       /** @return the 4-character key type for this MXF (MDIK, MDAK, etc.) */
-       virtual std::string key_type () const = 0;
-       
-       bool equals (
-               boost::shared_ptr<const Content> other,
-               EqualityOptions opt,
-               boost::function<void (NoteType, std::string)> note
-               ) const;
-
-       /** Fill in a ADSCP::WriteInfo struct.
-        *  @param w struct to fill in.
-        *  @param standard INTEROP or SMPTE.
-        */
-       void fill_writer_info (ASDCP::WriterInfo* w, Standard standard);
+       MXF ();
+       virtual ~MXF ();
 
        /** @return true if the data is encrypted */
        bool encrypted () const {
-               return !_key_id.empty ();
+               return static_cast<bool>(_key_id);
        }
 
        /** Set the ID of the key that is used for encryption/decryption.
@@ -72,8 +62,8 @@ public:
                _key_id = i;
        }
 
-       /** @return the ID of the key used for encryption/decryption, or an empty string */
-       std::string key_id () const {
+       /** @return the ID of the key used for encryption/decryption, if there is one */
+       boost::optional<std::string> key_id () const {
                return _key_id;
        }
 
@@ -84,11 +74,6 @@ public:
                return _key;
        }
 
-       /** @return encryption context, set up with any key that has been passed to set_key() */
-       ASDCP::AESEncContext* encryption_context () const {
-               return _encryption_context;
-       }
-
        /** Set the metadata that is written to the MXF file.
         *  @param m Metadata.
         */
@@ -102,16 +87,19 @@ public:
        }
 
 protected:
-       std::string pkl_type () const {
-               return "application/x-smpte-mxf";
-       }
-       
-       void read_writer_info (ASDCP::WriterInfo const &);
-       
-       ASDCP::AESEncContext* _encryption_context;
+       template <class P, class Q>
+       friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t* data, int size);
+
+       std::string read_writer_info (ASDCP::WriterInfo const &);
+       /** Fill in a ADSCP::WriteInfo struct.
+        *  @param w struct to fill in.
+        *  @param standard INTEROP or SMPTE.
+        */
+       void fill_writer_info (ASDCP::WriterInfo* w, std::string id, Standard standard) const;
+
        ASDCP::AESDecContext* _decryption_context;
-       /** ID of the key used for encryption/decryption, or an empty string */
-       std::string _key_id;
+       /** ID of the key used for encryption/decryption, if there is one */
+       boost::optional<std::string> _key_id;
        /** Key used for encryption/decryption, if there is one */
        boost::optional<Key> _key;
        MXFMetadata _metadata;