Fix bizarre quotation mark insertion by newer boost filesystem library.

diff --git a/src/asset.cc b/src/asset.cc
index 5133907160fc774999dd375b90a4201043bea167..0ad7b5b18290209dfd7f5be63e6cf450e9842d92 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -48,7 +48,7 @@ Asset::write_to_pkl (ostream& s) const
 {
        s << "    <Asset>\n"
          << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "      <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
+         << "      <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
          << "      <Hash>" << _digest << "</Hash>\n"
          << "      <Size>" << filesystem::file_size(_mxf_path) << "</Size>\n"
          << "      <Type>application/mxf</Type>\n"
@@ -62,7 +62,7 @@ Asset::write_to_assetmap (ostream& s) const
          << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
          << "      <ChunkList>\n"
          << "        <Chunk>\n"
-         << "          <Path>" << filesystem::path(_mxf_path).filename() << "</Path>\n"
+         << "          <Path>" << filesystem::path(_mxf_path).filename().string() << "</Path>\n"
          << "          <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 1620a1fa7d2de01ad7bfdc3409ba8decb1747ba3..40afc8b2447fea1a89af80ece27e3781d79f6176 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -121,7 +121,7 @@ PictureAsset::write_to_cpl (ostream& s) const
 {
        s << "        <MainPicture>\n"
          << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
+         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
          << "          <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 d2c451fb76ac033eb0ac57f64d59da5d8016a859..80313e07e438edda7e957a5e25515edfa0cbd824 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -161,7 +161,7 @@ SoundAsset::write_to_cpl (ostream& s) const
 {
        s << "        <MainSound>\n"
          << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
+         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
          << "          <EditRate>" << _fps << " 1</EditRate>\n"
          << "          <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
          << "          <EntryPoint>0</EntryPoint>\n"