Revert "Remove join function; the code is long and I don't think anybody"

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 7b1e630a6610b92db3ec373b67f15d106db070a6..629672b7317d8e2252cab36f528f2e69b9329f57 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"
@@ -360,6 +360,12 @@ 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
@@ -420,6 +426,7 @@ Content::add_properties (list<UserProperty>& p) const
        }
 }
 
+/** Take settings from the given content if it is of the correct type */
 void
 Content::take_settings_from (shared_ptr<const Content> c)
 {
@@ -429,7 +436,34 @@ Content::take_settings_from (shared_ptr<const Content> c)
        if (audio && c->audio) {
                audio->take_settings_from (c->audio);
        }
-       if (subtitle && c->subtitle) {
-               subtitle->take_settings_from (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> ();
 }