X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fproducer%2Fstage.h;h=900d841c990b208691ffc73742c7893c2147c5f8;hb=435cf4b385c5099270bee44f89c3e2615af30521;hp=681372a2dc62643f091355af964b95bfaee37c10;hpb=a9b91fc4213df638f5a83fa772fd7cab5908d508;p=casparcg

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 681372a2d..900d841c9 100644
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -23,10 +23,13 @@
 
 #include "frame_producer.h"
 
+#include "../monitor/monitor.h"
+
 #include <common/forward.h>
 #include <common/spl/memory.h>
 #include <common/tweener.h>
 
+#include <boost/optional.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
 
 #include <functional>
@@ -38,39 +41,53 @@ FORWARD1(boost, template<typename> class unique_future);
 
 namespace caspar { namespace core {
 	
-class stage sealed
+class stage sealed : public monitor::observable
 {
 	stage(const stage&);
 	stage& operator=(const stage&);
 public:	
+
+	// Static Members
+	
 	typedef std::function<struct frame_transform(struct frame_transform)> transform_func_t;
 	typedef std::tuple<int, transform_func_t, unsigned int, tweener> transform_tuple_t;
 
-	stage();
-		
-	std::map<int, spl::shared_ptr<class draw_frame>> operator()(const struct video_format_desc& format_desc);
+	// Constructors
+
+	explicit stage(spl::shared_ptr<diagnostics::graph> graph);
+	
+	// Methods
+
+	std::map<int, class draw_frame> operator()(const struct video_format_desc& format_desc);
 
 	void apply_transforms(const std::vector<transform_tuple_t>& transforms);
 	void apply_transform(int index, const transform_func_t& transform, unsigned int mix_duration = 0, const tweener& tween = L"linear");
 	void clear_transforms(int index);
 	void clear_transforms();
 				
-	void load(int index, const spl::shared_ptr<struct frame_producer>& producer, const boost::optional<int32_t>& auto_play_delta = nullptr);
+	void load(int index, const spl::shared_ptr<class frame_producer>& producer, const boost::optional<int32_t>& auto_play_delta = nullptr);
 	void pause(int index);
 	void play(int index);
 	void stop(int index);
 	void clear(int index);
 	void clear();	
-	void swap_layers(const spl::shared_ptr<stage>& other);
+	void swap_layers(stage& other);
 	void swap_layer(int index, int other_index);
-	void swap_layer(int index, int other_index, const spl::shared_ptr<stage>& other);
+	void swap_layer(int index, int other_index, stage& other);
 	
-	boost::unique_future<spl::shared_ptr<struct frame_producer>>	foreground(int index);
-	boost::unique_future<spl::shared_ptr<struct frame_producer>>	background(int index);
+	// monitor::observable
+
+	virtual void subscribe(const monitor::observable::observer_ptr& o) override;
+	virtual void unsubscribe(const monitor::observable::observer_ptr& o) override;
+
+	// Properties
+
+	boost::unique_future<spl::shared_ptr<class frame_producer>>	foreground(int index);
+	boost::unique_future<spl::shared_ptr<class frame_producer>>	background(int index);
+
+	boost::unique_future<boost::property_tree::wptree>			info() const;
+	boost::unique_future<boost::property_tree::wptree>			info(int index) const;
 
-	boost::unique_future<boost::property_tree::wptree> info() const;
-	boost::unique_future<boost::property_tree::wptree> info(int index) const;
-	
 private:
 	struct impl;
 	spl::shared_ptr<impl> impl_;