diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-08-01 15:53:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-08-01 15:53:42 +0100 |
| commit | 739dadd8691fa04c8e94d61c02a8b044436562a3 (patch) | |
| tree | c58545f7da411a9c43166f4bfb52915a439ecf5a /src | |
| parent | 6e97bc33b05113bf1ac88ff9ff4e72cc55a97314 (diff) | |
Tweak to build onboost filesystem v2
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset.cc | 7 | ||||
| -rw-r--r-- | src/picture_asset.cc | 12 | ||||
| -rw-r--r-- | src/sound_asset.cc | 12 |
3 files changed, 30 insertions, 1 deletions
diff --git a/src/asset.cc b/src/asset.cc index de299d34..92b235d8 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -122,9 +122,14 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " sizes differ"); return notes; } - + +#if BOOST_FILESYSTEM_VERSION == 3 ifstream a (mxf_path().c_str(), ios::binary); ifstream b (other->mxf_path().c_str(), ios::binary); +#else + ifstream a (mxf_path().string().c_str(), ios::binary); + ifstream b (other->mxf_path().string().c_str(), ios::binary); +#endif int buffer_size = 65536; char abuffer[buffer_size]; diff --git a/src/picture_asset.cc b/src/picture_asset.cc index d9456194..14a9eda6 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -100,7 +100,11 @@ PictureAsset::construct (sigc::slot<string, int> get_path) fill_writer_info (&writer_info); ASDCP::JP2K::MXFWriter mxf_writer; +#if BOOST_FILESYSTEM_VERSION == 3 if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, picture_desc))) { +#else + if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, picture_desc))) { +#endif throw FileError ("could not open MXF file for writing", mxf_path().string()); } @@ -147,12 +151,20 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const if (flags & MXF_INSPECT) { ASDCP::JP2K::MXFReader reader_A; +#if BOOST_FILESYSTEM_VERSION == 3 if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) { +#else + if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) { +#endif throw FileError ("could not open MXF file for reading", mxf_path().string()); } ASDCP::JP2K::MXFReader reader_B; +#if BOOST_FILESYSTEM_VERSION == 3 if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) { +#else + if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) { +#endif throw FileError ("could not open MXF file for reading", mxf_path().string()); } diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 9a738a08..fdb7c662 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -120,7 +120,11 @@ SoundAsset::construct (sigc::slot<string, Channel> get_path) fill_writer_info (&writer_info); ASDCP::PCM::MXFWriter mxf_writer; +#if BOOST_FILESYSTEM_VERSION == 3 if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, audio_desc))) { +#else + if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, audio_desc))) { +#endif throw FileError ("could not open audio MXF for writing", mxf_path().string()); } @@ -183,13 +187,21 @@ SoundAsset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const if (flags & MXF_INSPECT) { ASDCP::PCM::MXFReader reader_A; +#if BOOST_FILESYSTEM_VERSION == 3 if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) { +#else + if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) { +#endif cout << "failed " << mxf_path() << "\n"; throw FileError ("could not open MXF file for reading", mxf_path().string()); } ASDCP::PCM::MXFReader reader_B; +#if BOOST_FILESYSTEM_VERSION == 3 if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) { +#else + if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) { +#endif cout << "failed " << other->mxf_path() << "\n"; throw FileError ("could not open MXF file for reading", mxf_path().string()); } |