Made MIXER CROP work more as one might expect

[casparcg] / core / video_channel.h

diff --git a/core/video_channel.h b/core/video_channel.h
index 7a0225b6b0395d99281ebd3a558b2564b5da654c..2938b0528cd036c952004e07d09ad74d1e13171d 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -1,28 +1,34 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://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 "monitor/monitor.h"\r
+\r
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
+#include <boost/property_tree/ptree_fwd.hpp>\r
+\r
+#include <agents.h>\r
 \r
 namespace caspar { namespace core {\r
        \r
@@ -31,24 +37,35 @@ class mixer;
 class output;\r
 class ogl_device;\r
 struct video_format_desc;\r
-class video_channel_context;\r
+struct channel_layout;\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
+       // Static Members\r
+\r
+       // Constructors\r
+\r
+       explicit video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl, const channel_layout& audio_channel_layout);\r
+\r
+       // Methods\r
+\r
+       // Properties\r
 \r
        safe_ptr<stage> stage();\r
        safe_ptr<mixer> mixer();\r
        safe_ptr<output> output();\r
-\r
-       video_channel_context& context();\r
-\r
+       \r
        video_format_desc get_video_format_desc() const;\r
        void set_video_format_desc(const video_format_desc& format_desc);\r
+       \r
+       boost::property_tree::wptree info() const;\r
+       boost::property_tree::wptree delay_info() const;\r
 \r
-       std::wstring print() const;\r
+       int index() const;\r
+       \r
+       monitor::subject& monitor_output();\r
 \r
 private:\r
        struct implementation;\r