projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19c8f78
)
Make ::length return rounded-up length.
author
Carl Hetherington
<cth@carlh.net>
Wed, 12 Jul 2017 14:20:03 +0000
(15:20 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 12 Jul 2017 14:20:03 +0000
(15:20 +0100)
src/lib/film.cc
patch
|
blob
|
history
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 57a4decd1fe915d41cbac4c0b86c9417c14a55ce..0e244c3089858684bef5f88bb6ac8e33de32fb48 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-1113,7
+1113,7
@@
Film::move_content_later (shared_ptr<Content> c)
DCPTime
Film::length () const
{
- return _playlist->length
(
);
+ return _playlist->length
().ceil(video_frame_rate()
);
}
int
@@
-1456,7
+1456,7
@@
list<DCPTimePeriod>
Film::reels () const
{
list<DCPTimePeriod> p;
- DCPTime const len = length()
.ceil (video_frame_rate ())
;
+ DCPTime const len = length();
switch (reel_type ()) {
case REELTYPE_SINGLE: