projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pot/merge.
[dcpomatic.git]
/
src
/
lib
/
empty.cc
diff --git
a/src/lib/empty.cc
b/src/lib/empty.cc
index 98bf1f3d186e2619d864706e82dbebde22b2b108..68a153b0755d39a4869781847f12451fe042a4f8 100644
(file)
--- a/
src/lib/empty.cc
+++ b/
src/lib/empty.cc
@@
-34,16
+34,16
@@
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::function;
using boost::dynamic_pointer_cast;
using boost::function;
-Empty::Empty (
shared_ptr<const Film> film
, function<shared_ptr<ContentPart> (Content *)> part)
+Empty::Empty (
ContentList content, DCPTime length
, function<shared_ptr<ContentPart> (Content *)> part)
{
list<DCPTimePeriod> full;
{
list<DCPTimePeriod> full;
- BOOST_FOREACH (shared_ptr<Content> i,
film->content()
) {
+ BOOST_FOREACH (shared_ptr<Content> i,
content
) {
if (part (i.get())) {
full.push_back (DCPTimePeriod (i->position(), i->end()));
}
}
if (part (i.get())) {
full.push_back (DCPTimePeriod (i->position(), i->end()));
}
}
- _periods = subtract (DCPTimePeriod(DCPTime(),
film->length()
), coalesce(full));
+ _periods = subtract (DCPTimePeriod(DCPTime(),
length
), coalesce(full));
if (!_periods.empty ()) {
_position = _periods.front().from;
if (!_periods.empty ()) {
_position = _periods.front().from;