2.1.0: use UTF16 regex until we have a ICU build.

[casparcg] / core / video_channel.h

diff --git a/core/video_channel.h b/core/video_channel.h
index a87ea6309bce15250e3057a4ff1035d9a0e83c54..b6e9ead0cfbbc9583ef92339bc6bcf294cb10e32 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -1,51 +1,53 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
 *\r
-*  This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\r
 *\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
 *\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
 *\r
+* Author: Robert Nagy, ronag89@gmail.com\r
 */\r
 \r
 #pragma once\r
 \r
-#include "consumer/frame_consumer_device.h"\r
-#include "mixer/frame_mixer_device.h"\r
-#include "producer/frame_producer_device.h"\r
-\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
+#include <boost/property_tree/ptree_fwd.hpp>\r
+\r
 namespace caspar { namespace core {\r
        \r
+class stage;\r
+class mixer;\r
+class output;\r
 class ogl_device;\r
+struct video_format_desc;\r
 \r
 class video_channel : boost::noncopyable\r
 {\r
 public:\r
-       explicit video_channel(int index, const video_format_desc& format_desc, ogl_device& ogl);\r
-       video_channel(video_channel&& other);\r
-\r
-       safe_ptr<frame_producer_device> producer();\r
-       safe_ptr<frame_mixer_device>    mixer();\r
-       safe_ptr<frame_consumer_device> consumer();\r
+       explicit video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl);\r
 \r
+       safe_ptr<stage> stage();\r
+       safe_ptr<mixer> mixer();\r
+       safe_ptr<output> output();\r
+       \r
        video_format_desc get_video_format_desc() const;\r
        void set_video_format_desc(const video_format_desc& format_desc);\r
-\r
-       std::wstring print() const;\r
+       \r
+       boost::property_tree::ptree info() const;\r
 \r
 private:\r
        struct implementation;\r