From e436b324ed19b91008fdb56262f99f6d0269cabe Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Sep 2013 08:17:55 +0100 Subject: Allow progressive writes to be encrypted. --- src/picture_asset.cc | 8 ++++---- src/picture_asset.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 2c35e9f9..1c480348 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -222,8 +222,8 @@ MonoPictureAsset::MonoPictureAsset ( construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files), interop, metadata); } -MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size) - : PictureAsset (directory, mxf_name, 0, fps, 0, false, size) +MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size, bool encrypted) + : PictureAsset (directory, mxf_name, 0, fps, 0, encrypted, size) { } @@ -472,8 +472,8 @@ PictureAsset::key_type () const return "MDIK"; } -StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, Size size) - : PictureAsset (directory, mxf_name, 0, fps, 0, false, size) +StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, Size size, bool encrypted) + : PictureAsset (directory, mxf_name, 0, fps, 0, encrypted, size) { } diff --git a/src/picture_asset.h b/src/picture_asset.h index 2af1f69a..7fcc2efb 100644 --- a/src/picture_asset.h +++ b/src/picture_asset.h @@ -166,7 +166,7 @@ public: * @param fps Video frames per second. * @param size Size in pixels that the picture frames will be. */ - MonoPictureAsset (std::string directory, std::string mxf_name, int fps, Size size); + MonoPictureAsset (std::string directory, std::string mxf_name, int fps, Size size, bool encrypted); /** Start a progressive write to a MonoPictureAsset */ boost::shared_ptr start_write (bool, bool, MXFMetadata const & metadata = MXFMetadata ()); @@ -195,7 +195,7 @@ public: * @param fps Video frames per second. * @param size Size in pixels that the picture frames will be. */ - StereoPictureAsset (std::string directory, std::string mxf_name, int fps, Size size); + StereoPictureAsset (std::string directory, std::string mxf_name, int fps, Size size, bool encrypted); /** Start a progressive write to a StereoPictureAsset */ boost::shared_ptr start_write (bool, bool, MXFMetadata const & metadata = MXFMetadata ()); -- cgit v1.2.3