projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump ffmpeg to 5.1.2 "Riemann"
[dcpomatic.git]
/
src
/
lib
/
overlaps.cc
diff --git
a/src/lib/overlaps.cc
b/src/lib/overlaps.cc
index 7a541a7c292ec6b8c271b5f7604826de03b66365..fbc6b5cb1813c7646950f554c25cc952f8e6a5d0 100644
(file)
--- a/
src/lib/overlaps.cc
+++ b/
src/lib/overlaps.cc
@@
-21,7
+21,6
@@
#include "content.h"
#include "overlaps.h"
#include "content.h"
#include "overlaps.h"
-#include "types.h"
using std::function;
using std::function;
@@
-34,7
+33,7
@@
ContentList overlaps (shared_ptr<const Film> film, ContentList cl, function<bool
ContentList overlaps;
DCPTimePeriod period (from, to);
for (auto i: cl) {
ContentList overlaps;
DCPTimePeriod period (from, to);
for (auto i: cl) {
- if (part(i) &&
DCPTimePeriod(i->position(), i->end(film)
).overlap(period)) {
+ if (part(i) &&
i->period(film
).overlap(period)) {
overlaps.push_back (i);
}
}
overlaps.push_back (i);
}
}