X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fframe_rate_change.cc;h=8ad6de9425aa2675158ed5b7a3421658e4c0aedf;hb=47e29203daec51d313ed8ab8ef759752bce18d45;hp=80a167029009349913b21e15c35d6aa0c760b4f2;hpb=6a18a737ef8dfbfbe909afe8266f104a2125b5fb;p=dcpomatic.git

diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index 80a167029..8ad6de942 100644
--- a/src/lib/frame_rate_change.cc
+++ b/src/lib/frame_rate_change.cc
@@ -20,12 +20,15 @@
 
 #include "frame_rate_change.h"
 #include "types.h"
+#include "content.h"
+#include "film.h"
 #include "compose.hpp"
 #include <cmath>
 
 #include "i18n.h"
 
 using std::string;
+using boost::shared_ptr;
 
 static bool
 about_equal (double a, double b)
@@ -33,14 +36,31 @@ about_equal (double a, double b)
 	return (fabs (a - b) < VIDEO_FRAME_RATE_EPSILON);
 }
 
+FrameRateChange::FrameRateChange ()
+	: source (24)
+	, dcp (24)
+	, skip (false)
+	, repeat (1)
+	, change_speed (false)
+	, speed_up (1)
+{
+
+}
 
 FrameRateChange::FrameRateChange (double source_, int dcp_)
-	: source (source_)
-	, dcp (dcp_)
-	, skip (false)
+	: skip (false)
 	, repeat (1)
 	, change_speed (false)
 {
+	construct (source_, dcp_);
+}
+
+void
+FrameRateChange::construct (double source_, int dcp_)
+{
+	source = source_;
+	dcp = dcp_;
+
 	if (fabs (source / 2.0 - dcp) < fabs (source - dcp)) {
 		/* The difference between source and DCP frame rate will be lower
 		   (i.e. better) if we skip.
@@ -58,6 +78,20 @@ FrameRateChange::FrameRateChange (double source_, int dcp_)
 	change_speed = !about_equal (speed_up, 1.0);
 }
 
+FrameRateChange::FrameRateChange (shared_ptr<const Film> film, shared_ptr<const Content> content)
+	: skip (false)
+	, repeat (1)
+{
+	construct (content->active_video_frame_rate(film), film->video_frame_rate());
+}
+
+FrameRateChange::FrameRateChange (shared_ptr<const Film> film, Content const * content)
+	: skip (false)
+	, repeat (1)
+{
+	construct (content->active_video_frame_rate(film), film->video_frame_rate());
+}
+
 string
 FrameRateChange::description () const
 {
@@ -76,7 +110,9 @@ FrameRateChange::description () const
 
 		if (change_speed) {
 			double const pc = dcp * 100 / (source * factor());
-			description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
+			char buffer[256];
+			snprintf (buffer, sizeof(buffer), _("DCP will run at %.1f%% of the content speed.\n"), pc);
+			description += buffer;
 		}
 	}