Use dcp::file_to_string().

[dcpomatic.git] / src / lib / empty.h

diff --git a/src/lib/empty.h b/src/lib/empty.h
index abd6fdef003bb63a875c58465a241bda9d8ba822..145b84091a91520a026228e87d274d8aee2825e1 100644 (file)
--- a/src/lib/empty.h
+++ b/src/lib/empty.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     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 <list>
 
+
 struct empty_test1;
 struct empty_test2;
 struct empty_test3;
+struct empty_test_with_overlapping_content;
 struct player_subframe_test;
 
+
 class Empty
 {
 public:
        Empty () {}
-       Empty (boost::shared_ptr<const Film> film, boost::shared_ptr<const Playlist> playlist, boost::function<bool (boost::shared_ptr<const Content>)> part);
+       Empty (std::shared_ptr<const Film> film, std::shared_ptr<const Playlist> playlist, std::function<bool (std::shared_ptr<const Content>)> 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<dcpomatic::DCPTimePeriod> _periods;
        dcpomatic::DCPTime _position;
 };
 
+
 #endif