From: Carl Hetherington <cth@carlh.net>
Date: Thu, 22 Oct 2015 13:44:41 +0000 (+0100)
Subject: Somewhat hackily fix rounding of reel lengths.
X-Git-Tag: v2.4.13~11
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f24452ee5fe7af655a16d4e1a3bb1c87a54596cc

Somewhat hackily fix rounding of reel lengths.
---

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4a26ded3d..3cf46220e 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1292,7 +1292,7 @@ list<DCPTimePeriod>
 Film::reels () const
 {
 	list<DCPTimePeriod> p;
-	DCPTime const len = length ();
+	DCPTime const len = length().round_up (video_frame_rate ());
 
 	switch (reel_type ()) {
 	case REELTYPE_SINGLE:
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index a9b286315..1e8b9034a 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -584,6 +584,9 @@ list<DCPTime>
 VideoContent::reel_split_points () const
 {
 	list<DCPTime> t;
-	t.push_back (position ());
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	/* XXX: this is questionable; perhaps the position should be forced to be on a frame boundary */
+	t.push_back (position().round_up (film->video_frame_rate()));
 	return t;
 }