[decklink] #484 Possible race condition with move-assignment of packaged_task avoided...

[casparcg] / core / producer / layer.h

diff --git a/core/producer/layer.h b/core/producer/layer.h
index f5874131d663d597dce3a20dd891c0ab7104d417..2fb114f0381beb78b70fbeaf3feb97ac59df055f 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -32,11 +32,10 @@
 #include <common/memory.h>
 
 #include <boost/property_tree/ptree_fwd.hpp>
+#include <boost/optional.hpp>
 
 #include <string>
 
-FORWARD1(boost, template<typename T> class optional);
-
 namespace caspar { namespace core {
        
 class layer final : public interaction_sink
@@ -57,7 +56,7 @@ public:
 
        void swap(layer& other);  
                
-       void load(spl::shared_ptr<frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta = nullptr);
+       void load(spl::shared_ptr<frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta = boost::optional<int32_t>());
        void play();
        void pause();
        void resume();
@@ -80,6 +79,7 @@ public:
        spl::shared_ptr<frame_producer> background() const; 
 
        boost::property_tree::wptree    info() const;
+       boost::property_tree::wptree    delay_info() const;
 
 private:
        struct impl;