Move video frame rate ('prepared-for') into Content.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 3d35b4eeb1a5b5a977df4700874d937c83ef796b..57212c589155e699d93a5528d7a02dd5d294dbb4 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -18,6 +18,7 @@
 */
 
 #include "image_content.h"
+#include "video_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
 #include "film.h"
@@ -25,22 +26,23 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include "image_filename_sorter.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-#include "image_filename_sorter.cc"
-
 using std::string;
 using std::cout;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film)
-       , VideoContent (film)
 {
+       video.reset (new VideoContent (this, film));
+
        if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
                _paths.push_back (p);
        } else {
@@ -56,14 +58,15 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 
                sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
        }
+
+       set_default_colour_conversion ();
 }
 
 
 ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
-       , VideoContent (film, node, version)
 {
-
+       video.reset (new VideoContent (this, film, node, version));
 }
 
 string
@@ -84,7 +87,7 @@ string
 ImageContent::technical_summary () const
 {
        string s = Content::technical_summary() + " - "
-               + VideoContent::technical_summary() + " - ";
+               + video->technical_summary() + " - ";
 
        if (still ()) {
                s += _("still");
@@ -100,7 +103,7 @@ ImageContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("Image");
        Content::as_xml (node);
-       VideoContent::as_xml (node);
+       video->as_xml (node);
 }
 
 void
@@ -112,18 +115,8 @@ ImageContent::examine (shared_ptr<Job> job)
        DCPOMATIC_ASSERT (film);
 
        shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-       take_from_video_examiner (examiner);
-}
-
-void
-ImageContent::set_video_length (Frame len)
-{
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-               _video_length = len;
-       }
-
-       signal_changed (ContentProperty::LENGTH);
+       video->take_from_examiner (examiner);
+       set_default_colour_conversion ();
 }
 
 DCPTime
@@ -131,16 +124,17 @@ ImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
-       FrameRateChange const frc (video_frame_rate(), film->video_frame_rate());
-       return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
+       FrameRateChange const frc (active_video_frame_rate(), film->video_frame_rate());
+       return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
 }
 
 string
 ImageContent::identifier () const
 {
        SafeStringStream s;
-       s << VideoContent::identifier ();
-       s << "_" << video_length();
+       s << Content::identifier();
+       s << "_" << video->identifier ();
+       s << "_" << video->length();
        return s.str ();
 }
 
@@ -150,28 +144,13 @@ ImageContent::still () const
        return number_of_paths() == 1;
 }
 
-void
-ImageContent::set_video_frame_rate (float r)
-{
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-               if (_video_frame_rate == r) {
-                       return;
-               }
-
-               _video_frame_rate = r;
-       }
-
-       signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-}
-
 void
 ImageContent::set_default_colour_conversion ()
 {
        BOOST_FOREACH (boost::filesystem::path i, _paths) {
                if (valid_j2k_file (i)) {
                        /* We default to no colour conversion if we have JPEG2000 files */
-                       unset_colour_conversion ();
+                       video->unset_colour_conversion ();
                        return;
                }
        }
@@ -181,8 +160,8 @@ ImageContent::set_default_colour_conversion ()
        boost::mutex::scoped_lock lm (_mutex);
 
        if (s) {
-               _colour_conversion = PresetColourConversion::from_id ("srgb").conversion;
+               video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion);
        } else {
-               _colour_conversion = PresetColourConversion::from_id ("rec709").conversion;
+               video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
        }
 }