git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 25dd2212f9564c3ff55301428eb87389405a02c2..c009f4f812f05f489d97788d1ad599e9d5e268da 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -35,12 +35,17 @@ class output : public target<std::pair<safe_ptr<read_frame>, ticket>>, boost::no
 public:\r
        explicit output(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, int channel_index);\r
 \r
+       // target\r
+       \r
+       virtual void send(const std::pair<safe_ptr<read_frame>, ticket>& frame) override;\r
+\r
+       // output\r
+\r
        void add(int index, safe_ptr<frame_consumer>&& consumer);\r
        void remove(int index);\r
        \r
        void set_video_format_desc(const video_format_desc& format_desc);\r
 \r
-       virtual void send(const std::pair<safe_ptr<read_frame>, ticket>& frame); // nothrow\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index b741bf7552804826d133861a769d6d0841ff30fc..1a15466d9c20911a4bdde9f5c3fc2e1379e44fb2 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -50,8 +50,12 @@ public:
 \r
        explicit mixer(const safe_ptr<diagnostics::graph>& graph, const safe_ptr<target_t>& target, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl);\r
                \r
-       virtual void send(const std::pair<std::map<int, safe_ptr<basic_frame>>, ticket>& frames); // nothrow\r
+       // target\r
+\r
+       virtual void send(const std::pair<std::map<int, safe_ptr<basic_frame>>, ticket>& frames) override; \r
                \r
+       // mixer\r
+\r
        safe_ptr<core::write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc);         \r
        safe_ptr<core::write_frame> create_frame(const void* tag, size_t width, size_t height, pixel_format::type pix_fmt = pixel_format::bgra);                \r
        \r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 04e9a29888f822f712553e97ade8511701c72c0e..175129f8193908d05a96633c5053302c144d8685 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -40,6 +40,8 @@ public:
        typedef target<std::pair<std::map<int, safe_ptr<basic_frame>>, ticket>> target_t;\r
 \r
        explicit stage(const safe_ptr<diagnostics::graph>& graph, const safe_ptr<target_t>& target, const video_format_desc& format_desc);\r
+       \r
+       // stage\r
 \r
        void swap(stage& other);\r
                        \r