diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-21 21:02:51 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-21 21:02:51 +0000 |
| commit | e04553be273a10e7face6f8f245d9a37e05454d2 (patch) | |
| tree | c7ad2c97e224a13483612fee8a93a524a39055ab | |
| parent | c21da9cdd8284e8d36a08bc7976744a3cd74bede (diff) | |
| parent | 102c567af0eaa478f062971ae8dd5f6891e1457d (diff) | |
Merge master.
| -rw-r--r-- | src/picture_asset.cc | 2 | ||||
| -rw-r--r-- | src/sound_asset.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 564ada79..c3b49668 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -443,7 +443,7 @@ MonoPictureAssetWriter::write (uint8_t* data, int size) MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid()); - if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().c_str(), _state->writer_info, _state->picture_descriptor))) { + if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->picture_descriptor))) { throw MXFFileError ("could not open MXF file for writing", _asset->path().string()); } } diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 08ca71e5..b7253917 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -353,7 +353,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* a) MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid ()); - if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().c_str(), _state->writer_info, _state->audio_desc))) { + if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->audio_desc))) { throw FileError ("could not open audio MXF for writing", _asset->path().string()); } } |