Untested interop DCP/KDM support.

[libdcp.git] / src / sound_asset.cc

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 0d829b75fa022def1177d772dd23be953481a6b5..51f49d0ec8cc9b77ae4dd982a15e46859c1b7fed 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -50,6 +50,7 @@ SoundAsset::SoundAsset (
        int fps,
        int intrinsic_duration,
        bool encrypted,
+       bool interop,
        MXFMetadata const & metadata
        )
        : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted)
@@ -58,7 +59,7 @@ SoundAsset::SoundAsset (
 {
        assert (_channels);
        
-       construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), metadata);
+       construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), interop, metadata);
 }
 
 SoundAsset::SoundAsset (
@@ -70,6 +71,7 @@ SoundAsset::SoundAsset (
        int intrinsic_duration,
        int channels,
        bool encrypted,
+       bool interop,
        MXFMetadata const & metadata
        )
        : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted)
@@ -78,7 +80,7 @@ SoundAsset::SoundAsset (
 {
        assert (_channels);
        
-       construct (get_path, metadata);
+       construct (get_path, interop, metadata);
 }
 
 SoundAsset::SoundAsset (string directory, string mxf_name)
@@ -119,7 +121,7 @@ SoundAsset::path_from_channel (Channel channel, vector<string> const & files)
 }
 
 void
-SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata const & metadata)
+SoundAsset::construct (boost::function<string (Channel)> get_path, bool interop, MXFMetadata const & metadata)
 {
        ASDCP::Rational asdcp_edit_rate (_edit_rate, 1);
 
@@ -172,7 +174,7 @@ SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata c
        frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (audio_desc));
 
        ASDCP::WriterInfo writer_info;
-       MXFAsset::fill_writer_info (&writer_info, _uuid, metadata);
+       MXFAsset::fill_writer_info (&writer_info, _uuid, interop, metadata);
 
        ASDCP::PCM::MXFWriter mxf_writer;
        if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc))) {
@@ -304,10 +306,10 @@ SoundAsset::get_frame (int n) const
 }
 
 shared_ptr<SoundAssetWriter>
-SoundAsset::start_write (MXFMetadata const & metadata)
+SoundAsset::start_write (bool interop, MXFMetadata const & metadata)
 {
        /* XXX: can't we use a shared_ptr here? */
-       return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, metadata));
+       return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, interop, metadata));
 }
 
 struct SoundAssetWriter::ASDCPState
@@ -318,7 +320,7 @@ struct SoundAssetWriter::ASDCPState
        ASDCP::PCM::AudioDescriptor audio_desc;
 };
 
-SoundAssetWriter::SoundAssetWriter (SoundAsset* a, MXFMetadata const & m)
+SoundAssetWriter::SoundAssetWriter (SoundAsset* a, bool interop, MXFMetadata const & m)
        : _state (new SoundAssetWriter::ASDCPState)
        , _asset (a)
        , _finalized (false)
@@ -341,7 +343,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* a, MXFMetadata const & m)
        _state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
        memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity());
        
-       _asset->fill_writer_info (&_state->writer_info, _asset->uuid (), _metadata);
+       _asset->fill_writer_info (&_state->writer_info, _asset->uuid (), interop, _metadata);
        
        if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->audio_desc))) {
                boost::throw_exception (FileError ("could not open audio MXF for writing", _asset->path().string()));