SubtitleString -> shared_ptr<Subtitle>

[libdcp.git] / src / asset_writer.h

diff --git a/src/asset_writer.h b/src/asset_writer.h
index 80ce82b8719aa5a380a0e4f2c1a6b1a297faf92a..dcf57aad8ab7064130937a19a63a19cd363186c4 100644 (file)
--- a/src/asset_writer.h
+++ b/src/asset_writer.h
@@ -39,13 +39,9 @@
 #define LIBDCP_ASSET_WRITER_H
 
 #include "types.h"
+#include "crypto_context.h"
 #include <boost/filesystem.hpp>
 
-namespace ASDCP {
-       class AESEncContext;
-       class HMACContext;
-}
-
 namespace dcp {
 
 class MXF;
@@ -59,7 +55,7 @@ class MXF;
 class AssetWriter : public boost::noncopyable
 {
 public:
-       virtual ~AssetWriter ();
+       virtual ~AssetWriter () {}
        virtual bool finalize ();
 
        int64_t frames_written () const {
@@ -67,7 +63,7 @@ public:
        }
 
 protected:
-       AssetWriter (MXF* mxf, boost::filesystem::path file, Standard standard);
+       AssetWriter (MXF* mxf, boost::filesystem::path file);
 
        /** MXF that we are writing */
        MXF* _mxf;
@@ -81,8 +77,7 @@ protected:
        bool _finalized;
        /** true if something has been written to this asset */
        bool _started;
-       ASDCP::AESEncContext* _encryption_context;
-       ASDCP::HMACContext* _hmac_context;
+       boost::shared_ptr<EncryptionContext> _crypto_context;
 };
 
 }