diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-09-25 20:41:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-09-25 20:41:45 +0100 |
| commit | f76647abae551840a43bb8f07189051ec20bab6d (patch) | |
| tree | 12d67e33c71516480cb71381bc426dfe18513821 /src/picture_asset_writer.cc | |
| parent | e8530ea06f0b0883e5e19dd18beed70732ac5d3c (diff) | |
Switch away from the many-constructor-arguments approach to a hopefully simpler API.
Diffstat (limited to 'src/picture_asset_writer.cc')
| -rw-r--r-- | src/picture_asset_writer.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc index f5767e3d..ca5a3e96 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_asset_writer.cc @@ -52,14 +52,12 @@ FrameInfo::write (ostream& s) } -PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite, bool interop, MXFMetadata const & metadata) +PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite) : _asset (asset) , _frames_written (0) , _started (false) , _finalized (false) , _overwrite (overwrite) - , _interop (interop) - , _metadata (metadata) { } @@ -90,15 +88,15 @@ struct StereoPictureAssetWriter::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, bool interop, MXFMetadata const & metadata) - : PictureAssetWriter (asset, overwrite, interop, metadata) +MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, bool overwrite) + : PictureAssetWriter (asset, overwrite) , _state (new MonoPictureAssetWriter::ASDCPState) { _state->encryption_context = asset->encryption_context (); } -StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool overwrite, bool interop, MXFMetadata const & metadata) - : PictureAssetWriter (asset, overwrite, interop, metadata) +StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool overwrite) + : PictureAssetWriter (asset, overwrite) , _state (new StereoPictureAssetWriter::ASDCPState) , _next_eye (EYE_LEFT) { @@ -115,7 +113,7 @@ void libdcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, u state->j2k_parser.FillPictureDescriptor (state->picture_descriptor); state->picture_descriptor.EditRate = ASDCP::Rational (asset->edit_rate(), 1); - asset->fill_writer_info (&state->writer_info, asset->uuid(), writer->_interop, writer->_metadata); + asset->fill_writer_info (&state->writer_info, asset->uuid(), writer->_asset->interop(), writer->_asset->metadata()); if (ASDCP_FAILURE (state->mxf_writer.OpenWrite ( asset->path().string().c_str(), |