Fix a few Clang warnings.

[casparcg] / core / video_channel.h

diff --git a/core/video_channel.h b/core/video_channel.h
index 7a0225b6b0395d99281ebd3a558b2564b5da654c..4c256b0dca24861fd28e9c6b147be78d0d3bc4df 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -1,58 +1,84 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\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
-*\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
-*/\r
-\r
-#pragma once\r
-\r
-#include <common/memory/safe_ptr.h>\r
-\r
-#include <boost/noncopyable.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
-class video_channel_context;\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<stage> stage();\r
-       safe_ptr<mixer> mixer();\r
-       safe_ptr<output> output();\r
-\r
-       video_channel_context& context();\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
-private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
-};\r
-\r
-}}
\ 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_;
+};
+
+}}