Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/empty.h b/src/lib/empty.h
index ee11714289eaa42fe729c20d0854f00e019a849c..bd295206e3b4cdea8a691e56230a872b3b87d1c3 100644 (file)
--- 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,28 +29,31 @@
 struct empty_test1;
 struct empty_test2;
 struct player_subframe_test;
+class Piece;
 
 class Empty
 {
 public:
        Empty () {}
-       Empty (boost::shared_ptr<const Film> film, boost::function<boost::shared_ptr<ContentPart> (Content *)> part);
+       Empty (boost::shared_ptr<const Film> film, std::list<boost::shared_ptr<Piece> > pieces, boost::function<bool (boost::shared_ptr<Piece>)> part);
 
-       DCPTime position () const {
+       dcpomatic::DCPTime position () const {
                return _position;
        }
 
-       DCPTimePeriod period_at_position () const;
+       dcpomatic::DCPTimePeriod period_at_position () const;
 
        bool done () const;
 
-       void set_position (DCPTime amount);
+       void set_position (dcpomatic::DCPTime amount);
 
 private:
        friend struct ::empty_test1;
        friend struct ::empty_test2;
        friend struct ::player_subframe_test;
 
-       std::list<DCPTimePeriod> _periods;
-       DCPTime _position;
+       std::list<dcpomatic::DCPTimePeriod> _periods;
+       dcpomatic::DCPTime _position;
 };
+
+#endif