Replace hack with use of generic_string from boost::filesystem.

[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 6f0ba973044391a479b639fb9a1f1974b0975aa4..54339ed57518a941743b3e1b28b9d5c2ed709e07 100644 (file)
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +17,16 @@
 
 */
 
+/** @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 "picture_asset_writer_common.cc"
 
@@ -29,8 +34,7 @@ using std::istream;
 using std::ostream;
 using std::string;
 using boost::shared_ptr;
-using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 {
@@ -40,23 +44,24 @@ 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, bool overwrite)
-       : PictureAssetWriter (asset, overwrite)
+MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite)
+       : PictureAssetWriter (asset, file, standard, overwrite)
        , _state (new MonoPictureAssetWriter::ASDCPState)
 {
-       _state->encryption_context = asset->encryption_context ();
+
 }
 
 void
 MonoPictureAssetWriter::start (uint8_t* data, int size)
 {
-       libdcp::start (this, _state, _asset, data, size);
+       dcp::start (this, _state, _standard, _picture_asset, data, size);
+       _picture_asset->set_frame_rate (_picture_asset->edit_rate());
 }
 
 FrameInfo
 MonoPictureAssetWriter::write (uint8_t* data, int size)
 {
-       assert (!_finalized);
+       DCP_ASSERT (!_finalized);
 
        if (!_started) {
                start (data, size);
@@ -69,9 +74,9 @@ 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, _state->encryption_context, 0, &hash);
+       ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context, _hmac_context, &hash);
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string(), r));
+               boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
        }
 
        ++_frames_written;
@@ -81,29 +86,27 @@ MonoPictureAssetWriter::write (uint8_t* data, int size)
 void
 MonoPictureAssetWriter::fake_write (int size)
 {
-       assert (_started);
-       assert (!_finalized);
+       DCP_ASSERT (_started);
+       DCP_ASSERT (!_finalized);
 
        Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size);
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string(), r));
+               boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
        }
 
        ++_frames_written;
 }
 
-void
+bool
 MonoPictureAssetWriter::finalize ()
 {
-       assert (!_finalized);
-       
-       Kumu::Result_t r = _state->mxf_writer.Finalize();
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in finalizing video MXF", _asset->path().string(), r));
+       if (_started) {
+               Kumu::Result_t r = _state->mxf_writer.Finalize();
+               if (ASDCP_FAILURE (r)) {
+                       boost::throw_exception (MXFFileError ("error in finalizing video MXF", _file.string(), r));
+               }
        }
 
-       _finalized = true;
-       _asset->set_intrinsic_duration (_frames_written);
-       _asset->set_duration (_frames_written);
+       _picture_asset->_intrinsic_duration = _frames_written;
+       return PictureAssetWriter::finalize ();
 }
-