diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-04 00:39:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-04 00:39:39 +0100 |
| commit | 1938b1b08d38fc199717d1875a61ef05e5b965de (patch) | |
| tree | 3734257f39ea97983c7dc49425ae6d51a596215c /src/lib/empty.h | |
| parent | a45dd41c4dc7b95b1e3e79640e965ae663e7e680 (diff) | |
Build Empty objects from the presence or absence of decoders in
Pieces, rather than the presence or absence of content. This seems better
because of cases like encrypted DCPs without a a KDM: here we may have content
but no decoder.
Diffstat (limited to 'src/lib/empty.h')
| -rw-r--r-- | src/lib/empty.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/empty.h b/src/lib/empty.h index d8b00047f..73548f729 100644 --- a/src/lib/empty.h +++ b/src/lib/empty.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,9 @@ */ +#ifndef DCPOMATIC_EMPTY_H +#define DCPOMATIC_EMPTY_H + #include "playlist.h" #include "dcpomatic_time.h" #include "content_part.h" @@ -26,12 +29,13 @@ struct empty_test1; struct empty_test2; struct player_subframe_test; +class Piece; class Empty { public: Empty () {} - Empty (ContentList content, DCPTime length, boost::function<boost::shared_ptr<ContentPart> (Content *)> part); + Empty (std::list<boost::shared_ptr<Piece> > pieces, DCPTime length, boost::function<bool (boost::shared_ptr<Piece>)> part); DCPTime position () const { return _position; @@ -51,3 +55,5 @@ private: std::list<DCPTimePeriod> _periods; DCPTime _position; }; + +#endif |