X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fproducer%2Fstage.h;h=69925892ec05babee4b27d6112e6b623b832ed00;hb=c64b8283bfe0bcc28b0d196f997d6deec6b41a3f;hp=2fddec0c23f7f1dd83af68d0fbe9b6775ffd19f2;hpb=8ce604dedb112e843db6480c1d8901def4e0d870;p=casparcg

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 2fddec0c2..69925892e 100644
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -1,86 +1,111 @@
-/*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
-*
-* This file is part of CasparCG (www.casparcg.com).
-*
-* CasparCG is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* CasparCG is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
-*
-* Author: Robert Nagy, ronag89@gmail.com
-*/
-
-#pragma once
-
-#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>
-#include <tuple>
-#include <vector>
-
-FORWARD2(caspar, diagnostics, class graph);
-FORWARD1(boost, template<typename> class unique_future);
-
-namespace caspar { namespace core {
-	
-class stage sealed : public monitor::observable
-{
-	stage(const stage&);
-	stage& operator=(const stage&);
-public:	
-	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(spl::shared_ptr<diagnostics::graph> graph);
-		
-	std::map<int, spl::shared_ptr<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 pause(int index);
-	void play(int index);
-	void stop(int index);
-	void clear(int index);
-	void clear();	
-	void swap_layers(stage& other);
-	void swap_layer(int index, int other_index);
-	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);
-
-	boost::unique_future<boost::property_tree::wptree> info() const;
-	boost::unique_future<boost::property_tree::wptree> info(int index) const;
-	
-	// monitor::observable
-
-	virtual void subscribe(const monitor::observable::observer_ptr& o) override;
-	virtual void unsubscribe(const monitor::observable::observer_ptr& o) override;
-private:
-	struct impl;
-	spl::shared_ptr<impl> impl_;
-};
-
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include "../fwd.h"
+#include "../monitor/monitor.h"
+#include "../interaction/interaction_sink.h"
+
+#include <common/forward.h>
+#include <common/future_fwd.h>
+#include <common/memory.h>
+#include <common/tweener.h>
+
+#include <boost/optional.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
+
+#include <functional>
+#include <map>
+#include <tuple>
+#include <vector>
+
+FORWARD2(caspar, diagnostics, class graph);
+
+namespace caspar { namespace core {
+
+//typedef reactive::observable<std::map<int, class draw_frame>> frame_observable;
+	
+class stage final : public interaction_sink
+{
+	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;
+
+	// Constructors
+
+	explicit stage(int channel_index, spl::shared_ptr<caspar::diagnostics::graph> graph);
+	
+	// Methods
+
+	std::map<int, draw_frame>		operator()(const video_format_desc& format_desc);
+
+	std::future<void>				apply_transforms(const std::vector<transform_tuple_t>& transforms);
+	std::future<void>				apply_transform(int index, const transform_func_t& transform, unsigned int mix_duration, const tweener& tween);
+	std::future<void>				clear_transforms(int index);
+	std::future<void>				clear_transforms();
+	std::future<frame_transform>	get_current_transform(int index);
+	std::future<void>				load(int index, const spl::shared_ptr<frame_producer>& producer, bool preview = false, const boost::optional<int32_t>& auto_play_delta = boost::optional<int32_t>());
+	std::future<void>				pause(int index);
+	std::future<void>				resume(int index);
+	std::future<void>				play(int index);
+	std::future<void>				stop(int index);
+	std::future<std::wstring>		call(int index, const std::vector<std::wstring>& params);
+	std::future<void>				clear(int index);
+	std::future<void>				clear();
+	std::future<void>				swap_layers(stage& other, bool swap_transforms);
+	std::future<void>				swap_layer(int index, int other_index, bool swap_transforms);
+	std::future<void>				swap_layer(int index, int other_index, stage& other, bool swap_transforms);
+
+	void							add_layer_consumer(void* token, int layer, const spl::shared_ptr<write_frame_consumer>& layer_consumer);
+	void							remove_layer_consumer(void* token, int layer);
+
+	monitor::subject& monitor_output();	
+
+	// frame_observable
+	//void subscribe(const frame_observable::observer_ptr& o) override;
+	//void unsubscribe(const frame_observable::observer_ptr& o) override;
+
+	// interaction_sink
+
+	void on_interaction(const interaction_event::ptr& event) override;
+
+	// Properties
+
+	std::future<std::shared_ptr<frame_producer>>	foreground(int index);
+	std::future<std::shared_ptr<frame_producer>>	background(int index);
+
+	std::future<boost::property_tree::wptree>		info() const;
+	std::future<boost::property_tree::wptree>		info(int index) const;
+
+	std::future<boost::property_tree::wptree>		delay_info() const;
+	std::future<boost::property_tree::wptree>		delay_info(int layer) const;
+private:
+	struct impl;
+	spl::shared_ptr<impl> impl_;
+};
+
 }}
\ No newline at end of file