Tidy up after mass rename.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index f2380653f661d54131e50194f42522742f07a562..c1812b9fd1dcb5fa014d84187237aa2d127f6228 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 "text_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
@@ -430,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<TextContent> >::iterator i = text.begin ();
+       list<shared_ptr<TextContent> >::const_iterator j = c->text.begin ();
+       while (i != text.end() && j != c->text.end()) {
+               (*i)->take_settings_from (*j);
+               ++i;
+               ++j;
+       }
+}
+
+shared_ptr<TextContent>
+Content::only_text () const
+{
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty ()) {
+               return shared_ptr<TextContent> ();
        }
+       return text.front ();
+}
+
+shared_ptr<TextContent>
+Content::text_of_original_type (TextType type) const
+{
+       BOOST_FOREACH (shared_ptr<TextContent> i, text) {
+               if (i->original_type() == type) {
+                       return i;
+               }
+       }
+
+       return shared_ptr<TextContent> ();
 }