Add a log message and actually use device_for_write().

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 55ffac4f251f786ba9393307d1df24e561e0a785..8cf44bda1fd870682575f9bc3a6410b59f92bc5b 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -39,6 +39,7 @@ using std::cout;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 ImageContent::ImageContent (boost::filesystem::path p)
 {
@@ -135,10 +136,16 @@ ImageContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 DCPTime
 ImageContent::full_length (shared_ptr<const Film> film) const
 {
-       FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate());
+       FrameRateChange const frc (film, shared_from_this());
        return DCPTime::from_frames (llrint(video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 }
 
+DCPTime
+ImageContent::approximate_length () const
+{
+       return DCPTime::from_frames (video->length_after_3d_combine(), 24);
+}
+
 string
 ImageContent::identifier () const
 {
@@ -176,8 +183,8 @@ ImageContent::set_default_colour_conversion ()
 }
 
 void
-ImageContent::add_properties (list<UserProperty>& p) const
+ImageContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-       Content::add_properties (p);
+       Content::add_properties (film, p);
        video->add_properties (p);
 }