X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=fe35b0df3e800415b097691e59d8bc90e8d315e5;hb=3c1528e7406becf62d4d57d2515bca17d9bd1067;hp=81f4138fbef98248cf52aa16a7a8375c7d9a5adc;hpb=e65d31fbccad80c80f743516ecdd8269826d2114;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 81f4138fb..fe35b0df3 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -30,6 +30,7 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -38,8 +39,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 int const VideoContentProperty::SIZE	  = 0;
 int const VideoContentProperty::FRAME_TYPE  = 1;
 int const VideoContentProperty::CROP	  = 2;
@@ -234,9 +233,9 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	optional<double> const ar = d->sample_aspect_ratio ();
 	bool const yuv = d->yuv ();
 
-	ContentChange cc1 (_parent, VideoContentProperty::SIZE);
-	ContentChange cc2 (_parent, VideoContentProperty::SCALE);
-	ContentChange cc3 (_parent, ContentProperty::LENGTH);
+	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+	ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -332,10 +331,9 @@ VideoContent::size_after_crop () const
 }
 
 void
-VideoContent::scale_and_crop_to_fit_width ()
+VideoContent::scale_and_crop_to_fit_width (shared_ptr<const Film> film)
 {
-	shared_ptr<const Film> film = _parent->film ();
-	set_scale (VideoContentScale (film->container ()));
+	set_scale (VideoContentScale(film->container()));
 
 	int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
 	set_left_crop (0);
@@ -345,10 +343,9 @@ VideoContent::scale_and_crop_to_fit_width ()
 }
 
 void
-VideoContent::scale_and_crop_to_fit_height ()
+VideoContent::scale_and_crop_to_fit_height (shared_ptr<const Film> film)
 {
-	shared_ptr<const Film> film = _parent->film ();
-	set_scale (VideoContentScale (film->container ()));
+	set_scale (VideoContentScale(film->container()));
 
 	int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
 	set_left_crop (crop / 2);
@@ -357,15 +354,15 @@ VideoContent::scale_and_crop_to_fit_height ()
 	set_bottom_crop (0);
 }
 
-/** @param f Frame index within the whole (untrimmed) content */
+/** @param f Frame index within the whole (untrimmed) content.
+ *  @return Fade factor (between 0 and 1) or unset if there is no fade.
+ */
 optional<double>
-VideoContent::fade (Frame f) const
+VideoContent::fade (shared_ptr<const Film> film, Frame f) const
 {
 	DCPOMATIC_ASSERT (f >= 0);
 
-	shared_ptr<const Film> film = _parent->film ();
-
-	double const vfr = _parent->active_video_frame_rate ();
+	double const vfr = _parent->active_video_frame_rate(film);
 
 	Frame const ts = _parent->trim_start().frames_round(vfr);
 	if ((f - ts) < fade_in()) {
@@ -381,7 +378,7 @@ VideoContent::fade (Frame f) const
 }
 
 string
-VideoContent::processing_description () const
+VideoContent::processing_description (shared_ptr<const Film> film) const
 {
 	string d;
 	char buffer[256];
@@ -417,7 +414,6 @@ VideoContent::processing_description () const
 		d += buffer;
 	}
 
-	shared_ptr<const Film> film = _parent->film ();
 	dcp::Size const container_size = film->frame_size ();
 	dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
 
@@ -547,9 +543,9 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 }
 
 void
-VideoContent::modify_position (DCPTime& pos) const
+VideoContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
 {
-	pos = pos.round (_parent->film()->video_frame_rate());
+	pos = pos.round (film->video_frame_rate());
 }
 
 void