Use an enum class for Marker.

[libdcp.git] / src / mono_picture_asset_writer.cc

diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index c1f539a0fd59e411c3446cf42c532753520fc157..01fb11f0a482dbd676b0a2db4d91503c0bb6dd4f 100644 (file)
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -15,25 +15,38 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/mono_picture_asset_writer.cc
  *  @brief MonoPictureAssetWriter class
  */
 
-#include "AS_DCP.h"
-#include "KM_fileio.h"
 #include "mono_picture_asset_writer.h"
 #include "exceptions.h"
 #include "picture_asset.h"
 #include "dcp_assert.h"
+#include "crypto_context.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 #include "picture_asset_writer_common.cc"
 
-using std::istream;
-using std::ostream;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
 struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
@@ -44,22 +57,22 @@ struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 /** @param a Asset to write to.  `a' must not be deleted while
  *  this writer class still exists, or bad things will happen.
  */
-MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite)
-       : PictureAssetWriter (asset, file, standard, overwrite)
+MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+       : PictureAssetWriter (asset, file, overwrite)
        , _state (new MonoPictureAssetWriter::ASDCPState)
 {
 
 }
 
 void
-MonoPictureAssetWriter::start (uint8_t* data, int size)
+MonoPictureAssetWriter::start (uint8_t const * data, int size)
 {
-       dcp::start (this, _state, _standard, _picture_asset, data, size);
+       dcp::start (this, _state, _picture_asset, data, size);
        _picture_asset->set_frame_rate (_picture_asset->edit_rate());
 }
 
 FrameInfo
-MonoPictureAssetWriter::write (uint8_t* data, int size)
+MonoPictureAssetWriter::write (uint8_t const * data, int size)
 {
        DCP_ASSERT (!_finalized);
 
@@ -74,7 +87,7 @@ MonoPictureAssetWriter::write (uint8_t* data, int size)
        uint64_t const before_offset = _state->mxf_writer.Tell ();
 
        string hash;
-       ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context, _hmac_context, &hash);
+       ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _crypto_context->context(), _crypto_context->hmac(), &hash);
        if (ASDCP_FAILURE (r)) {
                boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
        }