X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=8cb30546371a7c43a19a3afd1529c7941ffbb0c4;hb=9c44c5fa8eaf00ef4e61c08273b8df55047ac082;hp=1b2dc34e79997adbb2be1c428890acbab8797045;hpb=5bcb8526fa49b5b180c0239ae47045818469c54c;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1b2dc34e7..8cb305463 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -32,7 +32,6 @@
 #include "log.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
 #include <libxml++/libxml++.h>
 #include <iomanip>
 #include <iostream>
@@ -235,6 +234,10 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	optional<double> const ar = d->sample_aspect_ratio ();
 	bool const yuv = d->yuv ();
 
+	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+	ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_size = vs;
@@ -242,10 +245,14 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 		_sample_aspect_ratio = ar;
 		_yuv = yuv;
 
-		/* Guess correct scale from size and sample aspect ratio */
-		_scale = VideoContentScale (
-			Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
-			);
+		if (Config::instance()->default_scale_to ()) {
+			_scale = VideoContentScale (Config::instance()->default_scale_to ());
+		} else {
+			/* Guess correct scale from size and sample aspect ratio */
+			_scale = VideoContentScale (
+				Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
+				);
+		}
 	}
 
 	LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
@@ -253,10 +260,6 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	if (d->video_frame_rate()) {
 		_parent->set_video_frame_rate (d->video_frame_rate().get());
 	}
-
-	_parent->signal_changed (VideoContentProperty::SIZE);
-	_parent->signal_changed (VideoContentProperty::SCALE);
-	_parent->signal_changed (ContentProperty::LENGTH);
 }
 
 /** @return string which includes everything about how this content looks */
@@ -431,7 +434,7 @@ VideoContent::processing_description () const
 	if (scaled != container_size) {
 		d += String::compose (
 			_("\nPadded with black to fit container %1 (%2x%3)"),
-			film->container()->nickname (),
+			film->container()->container_nickname (),
 			container_size.width, container_size.height
 			);
 
@@ -526,12 +529,33 @@ VideoContent::set_fade_out (Frame t)
 }
 
 void
-VideoContent::use_template (shared_ptr<const VideoContent> c)
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
+{
+	if (c->_colour_conversion) {
+		set_colour_conversion (c->_colour_conversion.get());
+	} else {
+		unset_colour_conversion ();
+	}
+	set_frame_type (c->_frame_type);
+	set_left_crop (c->_crop.left);
+	set_right_crop (c->_crop.right);
+	set_top_crop (c->_crop.top);
+	set_bottom_crop (c->_crop.bottom);
+	set_scale (c->_scale);
+	set_fade_in (c->_fade_in);
+	set_fade_out (c->_fade_out);
+}
+
+void
+VideoContent::modify_position (DCPTime& pos) const
+{
+	pos = pos.round (_parent->film()->video_frame_rate());
+}
+
+void
+VideoContent::modify_trim_start (ContentTime& trim) const
 {
-	_colour_conversion = c->_colour_conversion;
-	_frame_type = c->_frame_type;
-	_crop = c->_crop;
-	_scale = c->_scale;
-	_fade_in = c->_fade_in;
-	_fade_out = c->_fade_out;
+	if (_parent->video_frame_rate()) {
+		trim = trim.round (_parent->video_frame_rate().get());
+	}
 }