Merge branch 'master' into otio

2020-10-22 20:26:16 +11:00
parent 0ec262125c 384650e85a
commit 917738d1de
149 changed files with 4350 additions and 2079 deletions
@@ -122,6 +122,11 @@ void Block::set_length_and_media_in(const rational &length)
  LengthChangedEvent(old_length, length, Timeline::kTrimIn);
 }

+TimeRange Block::range() const
+{
+  return TimeRange(in(), out());
+}
+
 Block *Block::previous()
 {
  return previous_;