diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-12 15:17:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-12 15:17:50 +0100 |
| commit | 19c8f785894306bfa7998775d462f7f80cde8eaf (patch) | |
| tree | f1007ba7dc48ded78567bb133c5bcfbe58149e1e /src/lib/empty.h | |
| parent | dbaeeb06e7bc4bb1667a5a17076a0723284ed66c (diff) | |
Use Film::length() rather than Playlist::length() (former is rounded up
to the next video frame). Fix thinko in ::done(). Fix initial value
of _position when the first empty period does not start at time 0.
Diffstat (limited to 'src/lib/empty.h')
| -rw-r--r-- | src/lib/empty.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/empty.h b/src/lib/empty.h index 3c676deeb..ee1171428 100644 --- a/src/lib/empty.h +++ b/src/lib/empty.h @@ -24,12 +24,14 @@ #include <list> struct empty_test1; +struct empty_test2; +struct player_subframe_test; class Empty { public: Empty () {} - Empty (boost::shared_ptr<const Playlist> playlist, boost::function<boost::shared_ptr<ContentPart> (Content *)> part); + Empty (boost::shared_ptr<const Film> film, boost::function<boost::shared_ptr<ContentPart> (Content *)> part); DCPTime position () const { return _position; @@ -43,6 +45,8 @@ public: private: friend struct ::empty_test1; + friend struct ::empty_test2; + friend struct ::player_subframe_test; std::list<DCPTimePeriod> _periods; DCPTime _position; |