X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=629672b7317d8e2252cab36f528f2e69b9329f57;hb=6199e090dc1e32d3753ba7e7d7ea8c5f0d79f046;hp=691d3a66a546dd85c934d5f505e7e7cc74658f4f;hpb=dbaeeb06e7bc4bb1667a5a17076a0723284ed66c;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 691d3a66a..629672b73 100644
--- 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;
 
@@ -210,6 +211,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;
@@ -354,6 +360,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
@@ -403,16 +426,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);
+	}
+
+	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> ();
 	}
-	if (subtitle && c->subtitle) {
-		subtitle->use_template (c->subtitle);
+	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> ();
 }