Basics of multiple captions per content so that DCPContent can

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index b5bae69b684f8a57c50a94dc96803ee74571c15a..13c5794fe9eb46d087ba5faebf2881ed5424540a 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,7 +27,7 @@
 #include "content_factory.h"
 #include "video_content.h"
 #include "audio_content.h"
-#include "subtitle_content.h"
+#include "caption_content.h"
 #include "exceptions.h"
 #include "film.h"
 #include "job.h"
@@ -48,6 +48,7 @@ using std::vector;
 using std::max;
 using std::pair;
 using boost::shared_ptr;
+using boost::optional;
 using dcp::raw_convert;
 using dcp::locale_convert;
 
@@ -103,40 +104,6 @@ Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
        _video_frame_rate = node->optional_number_child<double> ("VideoFrameRate");
 }
 
-Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
-       : _film (film)
-       , _position (c.front()->position ())
-       , _trim_start (c.front()->trim_start ())
-       , _trim_end (c.back()->trim_end ())
-       , _video_frame_rate (c.front()->video_frame_rate())
-       , _change_signals_frequent (false)
-{
-       for (size_t i = 0; i < c.size(); ++i) {
-               if (i > 0 && c[i]->trim_start() > ContentTime ()) {
-                       throw JoinError (_("Only the first piece of content to be joined can have a start trim."));
-               }
-
-               if (i < (c.size() - 1) && c[i]->trim_end () > ContentTime ()) {
-                       throw JoinError (_("Only the last piece of content to be joined can have an end trim."));
-               }
-
-               if (
-                       (_video_frame_rate && !c[i]->_video_frame_rate) ||
-                       (!_video_frame_rate && c[i]->_video_frame_rate)
-                       ) {
-                       throw JoinError (_("Content to be joined must have the same video frame rate"));
-               }
-
-               if (_video_frame_rate && fabs (_video_frame_rate.get() - c[i]->_video_frame_rate.get()) > VIDEO_FRAME_RATE_EPSILON) {
-                       throw JoinError (_("Content to be joined must have the same video frame rate"));
-               }
-
-               for (size_t j = 0; j < c[i]->number_of_paths(); ++j) {
-                       _paths.push_back (c[i]->path (j));
-               }
-       }
-}
-
 void
 Content::as_xml (xmlpp::Node* node, bool with_paths) const
 {
@@ -190,6 +157,11 @@ Content::signal_changed (int p)
 void
 Content::set_position (DCPTime p)
 {
+       /* video content can modify its position */
+       if (video) {
+               video->modify_position (p);
+       }
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                if (p == _position) {
@@ -205,6 +177,11 @@ Content::set_position (DCPTime p)
 void
 Content::set_trim_start (ContentTime t)
 {
+       /* video content can modify its start trim */
+       if (video) {
+               video->modify_trim_start (t);
+       }
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _trim_start = t;
@@ -289,6 +266,13 @@ Content::set_path (boost::filesystem::path path)
        signal_changed (ContentProperty::PATH);
 }
 
+void
+Content::set_paths (vector<boost::filesystem::path> paths)
+{
+       _paths = paths;
+       signal_changed (ContentProperty::PATH);
+}
+
 string
 Content::path_summary () const
 {
@@ -326,8 +310,10 @@ list<DCPTime>
 Content::reel_split_points () const
 {
        list<DCPTime> t;
-       /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */
-       t.push_back (position().round_up (film()->video_frame_rate()));
+       /* This is only called for video content and such content has its position forced
+          to start on a frame boundary.
+       */
+       t.push_back (position());
        return t;
 }
 
@@ -340,6 +326,23 @@ Content::set_video_frame_rate (double r)
        }
 
        signal_changed (ContentProperty::VIDEO_FRAME_RATE);
+
+       /* Make sure things are still on frame boundaries */
+       if (video) {
+               set_position (position());
+               set_trim_start (trim_start());
+       }
+}
+
+void
+Content::unset_video_frame_rate ()
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _video_frame_rate = optional<double>();
+       }
+
+       signal_changed (ContentProperty::VIDEO_FRAME_RATE);
 }
 
 double
@@ -389,16 +392,44 @@ Content::add_properties (list<UserProperty>& p) const
        }
 }
 
+/** Take settings from the given content if it is of the correct type */
 void
-Content::use_template (shared_ptr<const Content> c)
+Content::take_settings_from (shared_ptr<const Content> c)
 {
        if (video && c->video) {
-               video->use_template (c->video);
+               video->take_settings_from (c->video);
        }
        if (audio && c->audio) {
-               audio->use_template (c->audio);
+               audio->take_settings_from (c->audio);
        }
-       if (subtitle && c->subtitle) {
-               subtitle->use_template (c->subtitle);
+
+       list<shared_ptr<CaptionContent> >::iterator i = caption.begin ();
+       list<shared_ptr<CaptionContent> >::const_iterator j = c->caption.begin ();
+       while (i != caption.end() && j != c->caption.end()) {
+               (*i)->take_settings_from (*j);
+               ++i;
+               ++j;
+       }
+}
+
+shared_ptr<CaptionContent>
+Content::only_caption () const
+{
+       DCPOMATIC_ASSERT (caption.size() < 2);
+       if (caption.empty ()) {
+               return shared_ptr<CaptionContent> ();
        }
+       return caption.front ();
+}
+
+shared_ptr<CaptionContent>
+Content::caption_of_original_type (CaptionType type) const
+{
+       BOOST_FOREACH (shared_ptr<CaptionContent> i, caption) {
+               if (i->original_type() == type) {
+                       return i;
+               }
+       }
+
+       return shared_ptr<CaptionContent> ();
 }