diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-20 02:42:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-20 02:42:23 +0100 |
| commit | d92919284b25526581f5a3f461f1e06106b91a09 (patch) | |
| tree | d7f44a387d4c0ad52d8110bdd26d67620b3a6631 /src | |
| parent | 472b7ac9d168685d0268b4941f9520e12d67dc23 (diff) | |
Try to work on old versions of boost filesystem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset.cc | 8 | ||||
| -rw-r--r-- | src/picture_asset.cc | 4 | ||||
| -rw-r--r-- | src/sound_asset.cc | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/asset.cc b/src/asset.cc index 0ad7b5b1..59d106b5 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -48,7 +48,11 @@ Asset::write_to_pkl (ostream& s) const { s << " <Asset>\n" << " <Id>urn:uuid:" << _uuid << "</Id>\n" +#if BOOST_FILESYSTEM_VERSION == 3 << " <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n" +#else + << " <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n" +#endif << " <Hash>" << _digest << "</Hash>\n" << " <Size>" << filesystem::file_size(_mxf_path) << "</Size>\n" << " <Type>application/mxf</Type>\n" @@ -62,7 +66,11 @@ Asset::write_to_assetmap (ostream& s) const << " <Id>urn:uuid:" << _uuid << "</Id>\n" << " <ChunkList>\n" << " <Chunk>\n" +#if BOOST_FILESYSTEM_VERSION == 3 << " <Path>" << filesystem::path(_mxf_path).filename().string() << "</Path>\n" +#else + << " <Path>" << filesystem::path(_mxf_path).filename() << "</Path>\n" +#endif << " <VolumeIndex>1</VolumeIndex>\n" << " <Offset>0</Offset>\n" << " <Length>" << filesystem::file_size(_mxf_path) << "</Length>\n" diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 40afc8b2..eb06012f 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -121,7 +121,11 @@ PictureAsset::write_to_cpl (ostream& s) const { s << " <MainPicture>\n" << " <Id>urn:uuid:" << _uuid << "</Id>\n" +#if BOOST_FILESYSTEM_VERSION == 3 << " <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n" +#else + << " <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n" +#endif << " <EditRate>" << _fps << " 1</EditRate>\n" << " <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n" << " <EntryPoint>0</EntryPoint>\n" diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 80313e07..3546bb5b 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -161,7 +161,11 @@ SoundAsset::write_to_cpl (ostream& s) const { s << " <MainSound>\n" << " <Id>urn:uuid:" << _uuid << "</Id>\n" +#if BOOST_FILESYSTEM_VERSION == 3 << " <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n" +#else + << " <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n" +#endif << " <EditRate>" << _fps << " 1</EditRate>\n" << " <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n" << " <EntryPoint>0</EntryPoint>\n" |