Restore nice rendering of content paths.

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 901cb53cf6ac8454995745703866e2af32c668d8..24378ed3da0aebb2e64adea52e4ead5fa5f88344 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -166,7 +166,8 @@ FFmpegContent::examine (shared_ptr<Job> job)
 string
 FFmpegContent::summary () const
 {
-       return String::compose (_("%1 [movie]"), path());
+       /* Get the string() here so that the name does not have quotes around it */
+       return String::compose (_("%1 [movie]"), path().filename().string());
 }
 
 string

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 713b80dcb331d815f7c30e0dabdea25389c651cc..2ca00cf6dc6c508812cc08feb9fd5365a8d5130c 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -55,6 +55,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml:
 string
 SndfileContent::summary () const
 {
+       /* Get the string() here so that the name does not have quotes around it */
        return String::compose (_("%1 [audio]"), path().filename().string());
 }
 

diff --git a/src/lib/still_image_content.cc b/src/lib/still_image_content.cc
index e829e205d49b3cbe04442e9bca3710840de26d0b..d0600f52e078cfa04a5792808cabf0e6d13830a3 100644 (file)
--- a/src/lib/still_image_content.cc
+++ b/src/lib/still_image_content.cc
@@ -48,7 +48,8 @@ StillImageContent::StillImageContent (shared_ptr<const Film> f, shared_ptr<const
 string
 StillImageContent::summary () const
 {
-       return String::compose (_("%1 [still]"), path());
+       /* Get the string() here so that the name does not have quotes around it */
+       return String::compose (_("%1 [still]"), path().filename().string());
 }
 
 string