Missing install file.

[libdcp.git] / src / picture_asset.cc

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index a505dc63f2efaa094fa2908eda9be3f89db8b460..b5f59f3be0ce04aa3dd19b757c92e62c9657cccc 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -64,18 +64,17 @@ PictureAsset::PictureAsset (string directory, string mxf_name)
 }
 
 void
-PictureAsset::write_to_cpl (ostream& s) const
+PictureAsset::write_to_cpl (xmlpp::Node* node) const
 {
-       s << "        <MainPicture>\n"
-         << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << _file_name << "</AnnotationText>\n"
-         << "          <EditRate>" << _edit_rate << " 1</EditRate>\n"
-         << "          <IntrinsicDuration>" << _intrinsic_duration << "</IntrinsicDuration>\n"
-         << "          <EntryPoint>" << _entry_point << "</EntryPoint>\n"
-         << "          <Duration>" << _duration << "</Duration>\n"
-         << "          <FrameRate>" << _edit_rate << " 1</FrameRate>\n"
-         << "          <ScreenAspectRatio>" << _size.width << " " << _size.height << "</ScreenAspectRatio>\n"
-         << "        </MainPicture>\n";
+       xmlpp::Node* mp = node->add_child ("MainPicture");
+       mp->add_child ("Id")->add_child_text ("urn:uuid:" + _uuid);
+       mp->add_child ("AnnotationText")->add_child_text (_file_name);
+       mp->add_child ("EditRate")->add_child_text (lexical_cast<string> (_edit_rate) + " 1");
+       mp->add_child ("IntrinsicDuration")->add_child_text (lexical_cast<string> (_intrinsic_duration));
+       mp->add_child ("EntryPoint")->add_child_text (lexical_cast<string> (_entry_point));
+       mp->add_child ("Duration")->add_child_text (lexical_cast<string> (_duration));
+       mp->add_child ("FrameRate")->add_child_text (lexical_cast<string> (_edit_rate) + " 1");
+       mp->add_child ("ScreenAspectRatio")->add_child_text (lexical_cast<string> (_size.width) + " " + lexical_cast<string> (_size.height));
 }
 
 bool
@@ -146,10 +145,12 @@ MonoPictureAsset::MonoPictureAsset (
        boost::signals2::signal<void (float)>* progress,
        int fps,
        int intrinsic_duration,
-       Size size)
+       Size size,
+       MXFMetadata const & metadata
+       )
        : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size)
 {
-       construct (get_path);
+       construct (get_path, metadata);
 }
 
 MonoPictureAsset::MonoPictureAsset (
@@ -159,10 +160,12 @@ MonoPictureAsset::MonoPictureAsset (
        boost::signals2::signal<void (float)>* progress,
        int fps,
        int intrinsic_duration,
-       Size size)
+       Size size,
+       MXFMetadata const & metadata
+       )
        : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size)
 {
-       construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files));
+       construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files), metadata);
 }
 
 MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size)
@@ -192,7 +195,7 @@ MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name)
 }
 
 void
-MonoPictureAsset::construct (boost::function<string (int)> get_path)
+MonoPictureAsset::construct (boost::function<string (int)> get_path, MXFMetadata const & metadata)
 {
        ASDCP::JP2K::CodestreamParser j2k_parser;
        ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte);
@@ -205,7 +208,7 @@ MonoPictureAsset::construct (boost::function<string (int)> get_path)
        picture_desc.EditRate = ASDCP::Rational (_edit_rate, 1);
        
        ASDCP::WriterInfo writer_info;
-       fill_writer_info (&writer_info, _uuid);
+       fill_writer_info (&writer_info, _uuid, metadata);
        
        ASDCP::JP2K::MXFWriter mxf_writer;
        if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, picture_desc, 16384, false))) {
@@ -407,10 +410,10 @@ StereoPictureAsset::get_frame (int n) const
 }
 
 shared_ptr<MonoPictureAssetWriter>
-MonoPictureAsset::start_write (bool overwrite)
+MonoPictureAsset::start_write (bool overwrite, MXFMetadata const & metadata)
 {
-       /* XXX: can't we use a shared_ptr here? */
-       return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, overwrite));
+       /* XXX: can't we use shared_ptr here? */
+       return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, overwrite, metadata));
 }
 
 FrameInfo::FrameInfo (istream& s)
@@ -441,13 +444,14 @@ struct MonoPictureAssetWriter::ASDCPState
 /** @param a Asset to write to.  `a' must not be deleted while
  *  this writer class still exists, or bad things will happen.
  */
-MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* a, bool overwrite)
+MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* a, bool overwrite, MXFMetadata const & m)
        : _state (new MonoPictureAssetWriter::ASDCPState)
        , _asset (a)
        , _frames_written (0)
        , _started (false)
        , _finalized (false)
        , _overwrite (overwrite)
+       , _metadata (m)
 {
 
 }
@@ -463,7 +467,7 @@ MonoPictureAssetWriter::start (uint8_t* data, int size)
        _state->j2k_parser.FillPictureDescriptor (_state->picture_descriptor);
        _state->picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
        
-       MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid());
+       MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid(), _metadata);
        
        if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (
                                   _asset->path().string().c_str(),
@@ -529,8 +533,3 @@ MonoPictureAssetWriter::finalize ()
        _asset->set_intrinsic_duration (_frames_written);
        _asset->set_duration (_frames_written);
 }
-
-MonoPictureAssetWriter::~MonoPictureAssetWriter ()
-{
-       assert (_finalized);
-}