projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[libdcp.git]
/
src
/
asset_writer.h
diff --git
a/src/asset_writer.h
b/src/asset_writer.h
index 80ce82b8719aa5a380a0e4f2c1a6b1a297faf92a..8842917aabf633b15d1be6cbf746708b5ade8350 100644
(file)
--- a/
src/asset_writer.h
+++ b/
src/asset_writer.h
@@
-39,12
+39,9
@@
#define LIBDCP_ASSET_WRITER_H
#include "types.h"
#define LIBDCP_ASSET_WRITER_H
#include "types.h"
+#include "crypto_context.h"
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-
-namespace ASDCP {
- class AESEncContext;
- class HMACContext;
-}
+#include <boost/noncopyable.hpp>
namespace dcp {
namespace dcp {
@@
-59,7
+56,7
@@
class MXF;
class AssetWriter : public boost::noncopyable
{
public:
class AssetWriter : public boost::noncopyable
{
public:
- virtual ~AssetWriter ()
;
+ virtual ~AssetWriter ()
{}
virtual bool finalize ();
int64_t frames_written () const {
virtual bool finalize ();
int64_t frames_written () const {
@@
-67,7
+64,7
@@
public:
}
protected:
}
protected:
- AssetWriter (MXF* mxf, boost::filesystem::path file
, Standard standard
);
+ AssetWriter (MXF* mxf, boost::filesystem::path file);
/** MXF that we are writing */
MXF* _mxf;
/** MXF that we are writing */
MXF* _mxf;
@@
-81,8
+78,7
@@
protected:
bool _finalized;
/** true if something has been written to this asset */
bool _started;
bool _finalized;
/** true if something has been written to this asset */
bool _started;
- ASDCP::AESEncContext* _encryption_context;
- ASDCP::HMACContext* _hmac_context;
+ std::shared_ptr<EncryptionContext> _crypto_context;
};
}
};
}