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 ae4dea44f5c0752f6b387365713f772336e8d867..812c756ec27891224495b1a57b3e374ee793321d 100644
(file)
--- a/
src/lib/dcpomatic_time.cc
+++ b/
src/lib/dcpomatic_time.cc
@@
-53,5
+53,11
@@
operator<< (ostream& s, DCPTime t)
bool
ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
{
bool
ContentTimePeriod::overlaps (ContentTimePeriod const & other) const
{
- return (from < other.to && to > other.from);
+ return (from < other.to && to >= other.from);
+}
+
+bool
+ContentTimePeriod::contains (ContentTime const & other) const
+{
+ return (from <= other && other < to);
}
}