More renaming.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 7b1e630a6610b92db3ec373b67f15d106db070a6..1a8bc9eb20aabe80a9c395121d45d61ff4ea555e 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
@@ -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)
 {