X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_channel.h;h=4c256b0dca24861fd28e9c6b147be78d0d3bc4df;hb=5422850939eee2b223eff6a0274c5d3c1fbe68bb;hp=51c2267ff2ba992e652cd89f7b2925c6ab36f892;hpb=a6f5b702bc78bee88f41480ac558e8a0b0c9f111;p=casparcg

diff --git a/core/video_channel.h b/core/video_channel.h
index 51c2267ff..4c256b0dc 100644
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -1,57 +1,84 @@
-/*
-* 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 <common/memory/safe_ptr.h>
-
-#include <boost/noncopyable.hpp>
-
-#include <boost/property_tree/ptree_fwd.hpp>
-
-namespace caspar { namespace core {
-	
-class stage;
-class mixer;
-class output;
-class ogl_device;
-struct video_format_desc;
-
-class video_channel : boost::noncopyable
-{
-public:
-	explicit video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl);
-
-	safe_ptr<stage> stage();
-	safe_ptr<mixer>	mixer();
-	safe_ptr<output> output();
-	
-	video_format_desc get_video_format_desc() const;
-	void set_video_format_desc(const video_format_desc& format_desc);
-	
-	boost::property_tree::wptree info() const;
-
-private:
-	struct implementation;
-	safe_ptr<implementation> impl_;
-};
-
-}}
\ No newline at end of file
+/*
+* 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 <common/memory.h>
+#include <common/forward.h>
+
+#include "fwd.h"
+
+#include "monitor/monitor.h"
+
+#include <boost/property_tree/ptree_fwd.hpp>
+
+#include <functional>
+
+namespace caspar { namespace core {
+
+class video_channel final
+{
+	video_channel(const video_channel&);
+	video_channel& operator=(const video_channel&);
+public:
+
+	// Static Members
+
+	// Constructors
+
+	explicit video_channel(
+			int index,
+			const video_format_desc& format_desc,
+			const audio_channel_layout& channel_layout,
+			std::unique_ptr<image_mixer> image_mixer);
+	~video_channel();
+
+	// Methods
+
+	monitor::subject&						monitor_output();
+
+	// Properties
+
+	const core::stage&						stage() const;
+	core::stage&							stage();
+	const core::mixer&						mixer() const;
+	core::mixer&							mixer();
+	const core::output&						output() const;
+	core::output&							output();
+
+	core::video_format_desc					video_format_desc() const;
+	void									video_format_desc(const core::video_format_desc& format_desc);
+	core::audio_channel_layout				audio_channel_layout() const;
+	void									audio_channel_layout(const core::audio_channel_layout& channel_layout);
+
+	std::shared_ptr<void>					add_tick_listener(std::function<void()> listener);
+
+	spl::shared_ptr<core::frame_factory>	frame_factory();
+
+	boost::property_tree::wptree			info() const;
+	boost::property_tree::wptree			delay_info() const;
+	int										index() const;
+private:
+	struct impl;
+	spl::unique_ptr<impl> impl_;
+};
+
+}}