From 472b7ac9d168685d0268b4941f9520e12d67dc23 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 19 Jul 2012 23:20:34 +0100
Subject: Fix bizarre quotation mark insertion by newer boost filesystem
 library.

---
 src/asset.cc         | 4 ++--
 src/picture_asset.cc | 2 +-
 src/sound_asset.cc   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/asset.cc b/src/asset.cc
index 51339071..0ad7b5b1 100644
--- 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 1620a1fa..40afc8b2 100644
--- 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 d2c451fb..80313e07 100644
--- 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"
-- 
cgit v1.2.3