projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-work idle handling from previous commit.
[dcpomatic.git]
/
src
/
lib
/
empty.cc
diff --git
a/src/lib/empty.cc
b/src/lib/empty.cc
index 1e6e1c3fb51d21e76b1d7f2c8b058bb97040a2e1..206acfdb0a67d62131bb11c688906e68f01b49e2 100644
(file)
--- a/
src/lib/empty.cc
+++ b/
src/lib/empty.cc
@@
-34,17
+34,18
@@
using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::function;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::function;
+using namespace dcpomatic;
-Empty::Empty (
list<shared_ptr<Piece> > pieces, DCPTime length
, function<bool (shared_ptr<Piece>)> part)
+Empty::Empty (
shared_ptr<const Film> film, list<shared_ptr<Piece> > pieces
, function<bool (shared_ptr<Piece>)> part)
{
list<DCPTimePeriod> full;
BOOST_FOREACH (shared_ptr<Piece> i, pieces) {
if (part(i)) {
{
list<DCPTimePeriod> full;
BOOST_FOREACH (shared_ptr<Piece> i, pieces) {
if (part(i)) {
- full.push_back (DCPTimePeriod (i->content->position(), i->content->end()));
+ full.push_back (DCPTimePeriod (i->content->position(), i->content->end(
film
)));
}
}
}
}
- _periods = subtract (DCPTimePeriod(DCPTime(),
length
), coalesce(full));
+ _periods = subtract (DCPTimePeriod(DCPTime(),
film->length()
), coalesce(full));
if (!_periods.empty ()) {
_position = _periods.front().from;
if (!_periods.empty ()) {
_position = _periods.front().from;