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 3a30ccf876888848ae735f1ac29c6c8fe343756f..0cf80b54682d248dc1175accfa4d1de5cd88cb02 100644 (file)
--- a/src/lib/still_image_content.cc
+++ b/src/lib/still_image_content.cc
@@ -48,15 +48,16 @@ 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());
 }
 
-bool
-StillImageContent::valid_file (boost::filesystem::path f)
+string
+StillImageContent::technical_summary () const
 {
-       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");
+       return Content::technical_summary() + " - "
+               + VideoContent::technical_summary() + " - "
+               + "still";
 }
 
 void
@@ -93,12 +94,12 @@ StillImageContent::set_video_length (VideoContent::Frame len)
 }
 
 Time
-StillImageContent::length () const
+StillImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
        
-       FrameRateConversion frc (video_frame_rate(), film->dcp_video_frame_rate ());
+       FrameRateConversion frc (video_frame_rate(), film->video_frame_rate ());
        return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
 }