Undo previous guess.

[dcpomatic.git] / src / lib / still_image_content.cc

diff --git a/src/lib/still_image_content.cc b/src/lib/still_image_content.cc
index 804a5c0f6d559186ee470485f7e97a58705bf0b1..0cf80b54682d248dc1175accfa4d1de5cd88cb02 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]"), file().filename().string());
+       /* Get the string() here so that the name does not have quotes around it */
+       return String::compose (_("%1 [still]"), path().filename().string());
 }
 
 string
@@ -59,14 +60,6 @@ StillImageContent::technical_summary () const
                + "still";
 }
 
-bool
-StillImageContent::valid_file (boost::filesystem::path f)
-{
-       string ext = f.extension().string();
-       transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-       return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp");
-}
-
 void
 StillImageContent::as_xml (xmlpp::Node* node) const
 {
@@ -101,7 +94,7 @@ StillImageContent::set_video_length (VideoContent::Frame len)
 }
 
 Time
-StillImageContent::length () const
+StillImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);