Rename Content::_file to path and support md5sums of directories.

[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..e829e205d49b3cbe04442e9bca3710840de26d0b 100644 (file)
--- a/src/lib/still_image_content.cc
+++ b/src/lib/still_image_content.cc
@@ -48,7 +48,15 @@ StillImageContent::StillImageContent (shared_ptr<const Film> f, shared_ptr<const
 string
 StillImageContent::summary () const
 {
-       return String::compose (_("%1 [still]"), file().filename().string());
+       return String::compose (_("%1 [still]"), path());
+}
+
+string
+StillImageContent::technical_summary () const
+{
+       return Content::technical_summary() + " - "
+               + VideoContent::technical_summary() + " - "
+               + "still";
 }
 
 bool
@@ -98,7 +106,7 @@ StillImageContent::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();
 }