]> git.sesse.net Git - casparcg/blobdiff - core/video_channel.h
Fix a few Clang warnings.
[casparcg] / core / video_channel.h
index 621d72f3f94e1aea7fb9722751a472ed0d1b50db..4c256b0dca24861fd28e9c6b147be78d0d3bc4df 100644 (file)
@@ -1,80 +1,84 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\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
-*\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 <common/spl/memory.h>\r
-#include <common/reactive.h>\r
-#include <common/forward.h>\r
-\r
-#include "monitor/monitor.h"\r
-\r
-#include <boost/property_tree/ptree_fwd.hpp>\r
-\r
-FORWARD3(caspar, core, ogl, class accelerator);\r
-FORWARD2(caspar, core, class stage);\r
-FORWARD2(caspar, core, class mixer);\r
-FORWARD2(caspar, core, class output);\r
-FORWARD2(caspar, core, class image_mixer);\r
-FORWARD2(caspar, core, struct video_format_desc);\r
-FORWARD2(caspar, core, class frame_factory);\r
-\r
-namespace caspar { namespace core {\r
-       \r
-typedef reactive::observable<spl::shared_ptr<const class data_frame>>  frame_observable;\r
-\r
-class video_channel sealed : public frame_observable\r
-                                                  , public monitor::observable\r
-{\r
-       video_channel(const video_channel&);\r
-       video_channel& operator=(const video_channel&);\r
-public:\r
-       explicit video_channel(int index, const video_format_desc& format_desc, spl::unique_ptr<image_mixer> image_mixer);\r
-       \r
-       const core::stage&      stage() const;\r
-       core::stage&            stage();\r
-       const core::mixer&      mixer() const;\r
-       core::mixer&            mixer();\r
-       const core::output&     output() const;\r
-       core::output&           output();\r
-               \r
-       core::video_format_desc video_format_desc() const;\r
-       void video_format_desc(const core::video_format_desc& format_desc);\r
-       \r
-       spl::shared_ptr<core::frame_factory> frame_factory();\r
-\r
-       boost::property_tree::wptree info() const;\r
-\r
-       // observable<spl::shared_ptr<const class data_frame>>\r
-       \r
-       virtual void subscribe(const frame_observable::observer_ptr& o) override;\r
-       virtual void unsubscribe(const frame_observable::observer_ptr& o) override;\r
-               \r
-       // monitor::observable\r
-\r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override;\r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
-private:\r
-       struct impl;\r
-       spl::shared_ptr<impl> 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_;
+};
+
+}}