projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.cc
diff --git
a/src/lib/dcpomatic_time.cc
b/src/lib/dcpomatic_time.cc
index 98888646d0a841e26bcb077a426be8ac66e1e8e4..ae4dea44f5c0752f6b387365713f772336e8d867 100644
(file)
--- a/
src/lib/dcpomatic_time.cc
+++ b/
src/lib/dcpomatic_time.cc
@@
-49,3
+49,9
@@
operator<< (ostream& s, DCPTime t)
s << "[DCP " << t.get() << " " << t.seconds() << "s]";
return s;
}
+
+bool
+ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
+{
+ return (from < other.to && to > other.from);
+}