X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fempty.h;h=145b84091a91520a026228e87d274d8aee2825e1;hb=9bfa07293928c371d59db2091ba2b7e715ce5994;hp=2a975562a4b2a8a30490e1d1f89fa9f3762bffd3;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/empty.h b/src/lib/empty.h index 2a975562a..145b84091 100644 --- a/src/lib/empty.h +++ b/src/lib/empty.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,24 +18,29 @@ */ + #ifndef DCPOMATIC_EMPTY_H #define DCPOMATIC_EMPTY_H + #include "playlist.h" #include "dcpomatic_time.h" #include "content_part.h" #include + struct empty_test1; struct empty_test2; struct empty_test3; +struct empty_test_with_overlapping_content; struct player_subframe_test; + class Empty { public: Empty () {} - Empty (std::shared_ptr film, std::shared_ptr playlist, boost::function)> part, dcpomatic::DCPTime length); + Empty (std::shared_ptr film, std::shared_ptr playlist, std::function)> part, dcpomatic::DCPTime length); dcpomatic::DCPTime position () const { return _position; @@ -51,10 +56,12 @@ private: friend struct ::empty_test1; friend struct ::empty_test2; friend struct ::empty_test3; + friend struct ::empty_test_with_overlapping_content; friend struct ::player_subframe_test; std::list _periods; dcpomatic::DCPTime _position; }; + #endif