Fix incorrect day-of-month in LocalTime.

[libdcp.git] / src / mono_picture_mxf_writer.cc

diff --git a/src/mono_picture_mxf_writer.cc b/src/mono_picture_mxf_writer.cc
index 24ca20793f4fd6b1322be41f4aef3050909167fb..01292876a0ef0438469b8719134cb7c9d4341e5d 100644 (file)
--- a/src/mono_picture_mxf_writer.cc
+++ b/src/mono_picture_mxf_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_mxf_writer.cc
+ *  @brief MonoPictureMXFWriter class
+ */
+
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "mono_picture_mxf_writer.h"
 #include "exceptions.h"
 #include "picture_mxf.h"
+#include "dcp_assert.h"
 
 #include "picture_mxf_writer_common.cc"
 
@@ -29,7 +34,6 @@ using std::istream;
 using std::ostream;
 using std::string;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using namespace dcp;
 
 struct MonoPictureMXFWriter::ASDCPState : public ASDCPStateBase
@@ -40,8 +44,8 @@ struct MonoPictureMXFWriter::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.
  */
-MonoPictureMXFWriter::MonoPictureMXFWriter (PictureMXF* asset, bool overwrite)
-       : PictureMXFWriter (asset, overwrite)
+MonoPictureMXFWriter::MonoPictureMXFWriter (PictureMXF* asset, boost::filesystem::path file, Standard standard, bool overwrite)
+       : PictureMXFWriter (asset, file, standard, overwrite)
        , _state (new MonoPictureMXFWriter::ASDCPState)
 {
        _state->encryption_context = asset->encryption_context ();
@@ -50,13 +54,14 @@ MonoPictureMXFWriter::MonoPictureMXFWriter (PictureMXF* asset, bool overwrite)
 void
 MonoPictureMXFWriter::start (uint8_t* data, int size)
 {
-       dcp::start (this, _state, _asset, data, size);
+       dcp::start (this, _state, _standard, _picture_mxf, data, size);
+       _picture_mxf->set_frame_rate (_picture_mxf->edit_rate());
 }
 
 FrameInfo
 MonoPictureMXFWriter::write (uint8_t* data, int size)
 {
-       assert (!_finalized);
+       DCP_ASSERT (!_finalized);
 
        if (!_started) {
                start (data, size);
@@ -71,7 +76,7 @@ MonoPictureMXFWriter::write (uint8_t* data, int size)
        string hash;
        ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _state->encryption_context, 0, &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,12 +86,12 @@ MonoPictureMXFWriter::write (uint8_t* data, int size)
 void
 MonoPictureMXFWriter::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", _mxf->file().string(), r));
        }
 
        ++_frames_written;
@@ -95,15 +100,11 @@ MonoPictureMXFWriter::fake_write (int size)
 void
 MonoPictureMXFWriter::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));
+               boost::throw_exception (MXFFileError ("error in finalizing video MXF", _mxf->file().string(), r));
        }
 
-       _finalized = true;
-       _asset->set_intrinsic_duration (_frames_written);
-       _asset->set_duration (_frames_written);
+       PictureMXFWriter::finalize ();
 }