2.1.0: Don't use virtual for override functions.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2580 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/accelerator/cpu/image/image_mixer.h b/accelerator/cpu/image/image_mixer.h
index db93965fc73880bb5224e4137fd3a8c02a3f2a43..d5c8f7f542c49e342bf16db269e72bedda94d1d2 100644 (file)
--- a/accelerator/cpu/image/image_mixer.h
+++ b/accelerator/cpu/image/image_mixer.h
@@ -42,9 +42,9 @@ public:
        virtual void visit(const core::const_frame& frame);\r
        virtual void pop();\r
                \r
-       virtual boost::unique_future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;\r
+       boost::unique_future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;\r
                \r
-       virtual core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) override;\r
+       core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) override;\r
 \r
        // Properties\r
 \r

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index 2a6de6d05475652952bdd58b22aa16609a24000d..06f9dd6c7c9662102620deae58a9acf0b8b2e01b 100644 (file)
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -328,7 +328,7 @@ public:
                return renderer_(std::move(layers_), format_desc);\r
        }\r
        \r
-       virtual core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) override\r
+       core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) override\r
        {\r
                std::vector<array<std::uint8_t>> buffers;\r
                BOOST_FOREACH(auto& plane, desc.planes)         \r

diff --git a/accelerator/ogl/image/image_mixer.h b/accelerator/ogl/image/image_mixer.h
index 950af6b6df1f43225e8ca78cebb9fbfad2f818f7..4ced1155f1a6208b1dee6f2d8a1efc1858a339bd 100644 (file)
--- a/accelerator/ogl/image/image_mixer.h
+++ b/accelerator/ogl/image/image_mixer.h
@@ -54,17 +54,17 @@ public:
 \r
        // Methods\r
                        \r
-       virtual boost::unique_future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;                \r
-       virtual core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) override;\r
+       boost::unique_future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;                \r
+       core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) override;\r
 \r
        // core::image_mixer\r
        \r
-       virtual void begin_layer(core::blend_mode blend_mode) override;\r
-       virtual void end_layer() override;\r
+       void begin_layer(core::blend_mode blend_mode) override;\r
+       void end_layer() override;\r
 \r
-       virtual void push(const core::frame_transform& frame) override;\r
-       virtual void visit(const core::const_frame& frame) override;\r
-       virtual void pop() override;\r
+       void push(const core::frame_transform& frame) override;\r
+       void visit(const core::const_frame& frame) override;\r
+       void pop() override;\r
                        \r
        // Properties\r
 \r

diff --git a/common/reactive.h b/common/reactive.h
index 9d0efeed9c5d32d1ea45a806fc008f1617737c45..e0e2d4aae1bd49b76c3b3b7bfa12716ec7afaaa7 100644 (file)
--- a/common/reactive.h
+++ b/common/reactive.h
@@ -170,7 +170,7 @@ public:
                std::swap(filter_, other.filter_);\r
        }\r
                \r
-       virtual void on_next(const T& e) override\r
+       void on_next(const T& e) override\r
        {\r
                func_(e);\r
        }\r
@@ -323,17 +323,17 @@ public:
                impl_.swap(other.impl_);\r
        }\r
        \r
-       virtual void subscribe(const observer_ptr& o) override\r
+       void subscribe(const observer_ptr& o) override\r
        {                               \r
                impl_->subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const observer_ptr& o) override\r
+       void unsubscribe(const observer_ptr& o) override\r
        {\r
                impl_->unsubscribe(o);\r
        }\r
                                \r
-       virtual void on_next(const I& e) override\r
+       void on_next(const I& e) override\r
        {                               \r
                impl_->on_next(e);\r
        }\r

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index ef810068b27cdfe663f0424cbf9ebc938041d07a..8371caf033815b8950f47eef791aaafa2a4707bf 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -76,14 +76,14 @@ public:
                }).detach(); \r
        }\r
        \r
-       virtual bool send(const_frame frame) override                                                                                                   {return consumer_->send(std::move(frame));}\r
+       bool send(const_frame frame) override                                                                                                   {return consumer_->send(std::move(frame));}\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) override        {return consumer_->initialize(format_desc, channel_index);}\r
-       virtual std::wstring print() const override                                                                                                                     {return consumer_->print();}    \r
-       virtual std::wstring name() const override                                                                                                                      {return consumer_->name();}\r
-       virtual boost::property_tree::wptree info() const override                                                                                      {return consumer_->info();}\r
-       virtual bool has_synchronization_clock() const override                                                                                         {return consumer_->has_synchronization_clock();}\r
-       virtual int buffer_depth() const override                                                                                                                       {return consumer_->buffer_depth();}\r
-       virtual int index() const override                                                                                                                                      {return consumer_->index();}\r
+       std::wstring print() const override                                                                                                                     {return consumer_->print();}    \r
+       std::wstring name() const override                                                                                                                      {return consumer_->name();}\r
+       boost::property_tree::wptree info() const override                                                                                      {return consumer_->info();}\r
+       bool has_synchronization_clock() const override                                                                                         {return consumer_->has_synchronization_clock();}\r
+       int buffer_depth() const override                                                                                                                       {return consumer_->buffer_depth();}\r
+       int index() const override                                                                                                                                      {return consumer_->index();}\r
 };\r
 \r
 class print_consumer_proxy : public frame_consumer\r
@@ -104,14 +104,14 @@ public:
                CASPAR_LOG(info) << str << L" Uninitialized.";\r
        }\r
        \r
-       virtual bool send(const_frame frame) override                                                                                                   {return consumer_->send(std::move(frame));}\r
+       bool send(const_frame frame) override                                                                                                   {return consumer_->send(std::move(frame));}\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) override        {return consumer_->initialize(format_desc, channel_index);}\r
-       virtual std::wstring print() const override                                                                                                                     {return consumer_->print();}\r
-       virtual std::wstring name() const override                                                                                                                      {return consumer_->name();}\r
-       virtual boost::property_tree::wptree info() const override                                                                                      {return consumer_->info();}\r
-       virtual bool has_synchronization_clock() const override                                                                                         {return consumer_->has_synchronization_clock();}\r
-       virtual int buffer_depth() const override                                                                                                                       {return consumer_->buffer_depth();}\r
-       virtual int index() const override                                                                                                                                      {return consumer_->index();}\r
+       std::wstring print() const override                                                                                                                     {return consumer_->print();}\r
+       std::wstring name() const override                                                                                                                      {return consumer_->name();}\r
+       boost::property_tree::wptree info() const override                                                                                      {return consumer_->info();}\r
+       bool has_synchronization_clock() const override                                                                                         {return consumer_->has_synchronization_clock();}\r
+       int buffer_depth() const override                                                                                                                       {return consumer_->buffer_depth();}\r
+       int index() const override                                                                                                                                      {return consumer_->index();}\r
 };\r
 \r
 class recover_consumer_proxy : public frame_consumer\r
@@ -155,12 +155,12 @@ public:
                return consumer_->initialize(format_desc, channel_index);\r
        }\r
 \r
-       virtual std::wstring print() const override                                     {return consumer_->print();}\r
-       virtual std::wstring name() const override                                      {return consumer_->name();}\r
-       virtual boost::property_tree::wptree info() const override      {return consumer_->info();}\r
-       virtual bool has_synchronization_clock() const override         {return consumer_->has_synchronization_clock();}\r
-       virtual int buffer_depth() const override                                       {return consumer_->buffer_depth();}\r
-       virtual int index() const override                                                      {return consumer_->index();}\r
+       std::wstring print() const override                                     {return consumer_->print();}\r
+       std::wstring name() const override                                      {return consumer_->name();}\r
+       boost::property_tree::wptree info() const override      {return consumer_->info();}\r
+       bool has_synchronization_clock() const override         {return consumer_->has_synchronization_clock();}\r
+       int buffer_depth() const override                                       {return consumer_->buffer_depth();}\r
+       int index() const override                                                      {return consumer_->index();}\r
 };\r
 \r
 // This class is used to guarantee that audio cadence is correct. This is important for NTSC audio.\r
@@ -175,14 +175,14 @@ public:
        {\r
        }\r
        \r
-       virtual void initialize(const video_format_desc& format_desc, int channel_index) override\r
+       void initialize(const video_format_desc& format_desc, int channel_index) override\r
        {\r
                audio_cadence_  = format_desc.audio_cadence;\r
                sync_buffer_    = boost::circular_buffer<std::size_t>(format_desc.audio_cadence.size());\r
                consumer_->initialize(format_desc, channel_index);\r
        }\r
 \r
-       virtual bool send(const_frame frame) override\r
+       bool send(const_frame frame) override\r
        {               \r
                if(audio_cadence_.size() == 1)\r
                        return consumer_->send(frame);\r
@@ -203,12 +203,12 @@ public:
                return result;\r
        }\r
        \r
-       virtual std::wstring print() const override                                     {return consumer_->print();}\r
-       virtual std::wstring name() const override                                      {return consumer_->name();}\r
-       virtual boost::property_tree::wptree info() const override      {return consumer_->info();}\r
-       virtual bool has_synchronization_clock() const override         {return consumer_->has_synchronization_clock();}\r
-       virtual int buffer_depth() const override                                       {return consumer_->buffer_depth();}\r
-       virtual int index() const override                                                      {return consumer_->index();}\r
+       std::wstring print() const override                                     {return consumer_->print();}\r
+       std::wstring name() const override                                      {return consumer_->name();}\r
+       boost::property_tree::wptree info() const override      {return consumer_->info();}\r
+       bool has_synchronization_clock() const override         {return consumer_->has_synchronization_clock();}\r
+       int buffer_depth() const override                                       {return consumer_->buffer_depth();}\r
+       int index() const override                                                      {return consumer_->index();}\r
 };\r
 \r
 spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)\r
@@ -245,14 +245,14 @@ const spl::shared_ptr<frame_consumer>& frame_consumer::empty()
        class empty_frame_consumer : public frame_consumer\r
        {\r
        public:\r
-               virtual bool send(const_frame) override {return false;}\r
-               virtual void initialize(const video_format_desc&, int) override{}\r
-               virtual std::wstring print() const override {return L"empty";}\r
-               virtual std::wstring name() const override {return L"empty";}\r
-               virtual bool has_synchronization_clock() const override {return false;}\r
-               virtual int buffer_depth() const override {return 0;};\r
+               bool send(const_frame) override {return false;}\r
+               void initialize(const video_format_desc&, int) override{}\r
+               std::wstring print() const override {return L"empty";}\r
+               std::wstring name() const override {return L"empty";}\r
+               bool has_synchronization_clock() const override {return false;}\r
+               int buffer_depth() const override {return 0;};\r
                virtual int index() const{return -1;}\r
-               virtual boost::property_tree::wptree info() const override\r
+               boost::property_tree::wptree info() const override\r
                {\r
                        boost::property_tree::wptree info;\r
                        info.add(L"type", L"empty");\r

diff --git a/core/monitor/monitor.h b/core/monitor/monitor.h
index f19847d1d42f77c928459df964fbf08089cdd20a..a64997b6dde179339f166131d673ea28171e6f83 100644 (file)
--- a/core/monitor/monitor.h
+++ b/core/monitor/monitor.h
@@ -235,19 +235,19 @@ public:
 \r
        // observable\r
        \r
-       virtual void subscribe(const observer_ptr& o) override\r
+       void subscribe(const observer_ptr& o) override\r
        {                               \r
                impl_->subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const observer_ptr& o) override\r
+       void unsubscribe(const observer_ptr& o) override\r
        {\r
                impl_->unsubscribe(o);\r
        }\r
 \r
        // observer\r
                                \r
-       virtual void on_next(const monitor::event& e) override\r
+       void on_next(const monitor::event& e) override\r
        {                               \r
                impl_->on_next(e);\r
        }\r

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 9b28f58ba7a0b0c97741ad21405e779bc712b8e8..6270a2a4be62db2a972aaafaf130687bd77d8d49 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -56,24 +56,24 @@ public:
 \r
        // frame_producer\r
                        \r
-       virtual draw_frame receive(int) override\r
+       draw_frame receive(int) override\r
        {\r
                event_subject_ << monitor::event("color") % color_str_;\r
 \r
                return frame_;\r
        }       \r
        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"color[" + color_str_ + L"]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"color";\r
        }\r
 \r
-       virtual draw_frame last_frame() const override\r
+       draw_frame last_frame() const override\r
        {\r
                return frame_;\r
        }\r
@@ -86,12 +86,12 @@ public:
                return info;\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
+       void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
        {\r
                return event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
        {\r
                return event_subject_.unsubscribe(o);\r
        }\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 2312605de47367ee3ca400f862cd57375d59d537..bfc00d4e338ae4cef9c1a97386fd81364ba5d018 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -66,7 +66,7 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty()
                virtual void unsubscribe(const monitor::observable::observer_ptr& o){}  \r
                virtual std::wstring name() const {return L"empty";}\r
        \r
-               virtual boost::property_tree::wptree info() const override\r
+               boost::property_tree::wptree info() const override\r
                {\r
                        boost::property_tree::wptree info;\r
                        info.add(L"type", L"empty-producer");\r
@@ -118,14 +118,14 @@ public:
                }).detach(); \r
        }\r
        \r
-       virtual draw_frame      receive(int flags) override                                                                                                                                                             {return producer_->receive(flags);}\r
-       virtual draw_frame      last_frame() const override                                                                                                                                                             {return producer_->last_frame();}\r
-       virtual std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
-       virtual std::wstring                                                                            name() const override                                                                                                                   {return producer_->name();}\r
-       virtual boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
-       virtual boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
-       virtual void                                                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override              {return producer_->leading_producer(producer);}\r
-       virtual uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
+       draw_frame      receive(int flags) override                                                                                                                                                             {return producer_->receive(flags);}\r
+       draw_frame      last_frame() const override                                                                                                                                                             {return producer_->last_frame();}\r
+       std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
+       std::wstring                                                                            name() const override                                                                                                                   {return producer_->name();}\r
+       boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
+       boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
+       void                                                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override              {return producer_->leading_producer(producer);}\r
+       uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
        virtual void subscribe(const monitor::observable::observer_ptr& o)                                                                                                                                                      {return producer_->subscribe(o);}\r
        virtual void unsubscribe(const monitor::observable::observer_ptr& o)                                                                                                                                            {return producer_->unsubscribe(o);}\r
 };\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 4eac589b19187f7a89f1cc2b92cf5a794a72c1c0..fe2873e2e9110ecf1e9a9ab34d5664ae533a0e69 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -64,8 +64,8 @@ public:
        \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
+       void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 \r
        // Properties\r
                \r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 28e68ece9582e41bb9644e38448502b8943b75a1..2aa179d1515c37b41200c99b17ab4e4dd07e3b71 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -61,7 +61,7 @@ public:
 \r
        // frame_producer\r
        \r
-       virtual draw_frame receive(int flags) override\r
+       draw_frame receive(int flags) override\r
        {\r
                tbb::parallel_invoke(\r
                [&]\r
@@ -92,28 +92,28 @@ public:
                return frame;\r
        }\r
 \r
-       virtual draw_frame last_frame() const override\r
+       draw_frame last_frame() const override\r
        {\r
                return draw_frame::still(last_frame_);\r
        }\r
                \r
-       virtual uint32_t nb_frames() const override\r
+       uint32_t nb_frames() const override\r
        {\r
                return std::min(fill_producer_->nb_frames(), key_producer_->nb_frames());\r
        }\r
 \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"separated[fill:" + fill_producer_->print() + L"|key[" + key_producer_->print() + L"]]";\r
        }       \r
 \r
-       virtual boost::unique_future<std::wstring> call(const std::wstring& str) override\r
+       boost::unique_future<std::wstring> call(const std::wstring& str) override\r
        {\r
                key_producer_->call(str);\r
                return fill_producer_->call(str);\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"separated";\r
        }\r
@@ -123,12 +123,12 @@ public:
                return fill_producer_->info();;\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
+       void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
        {\r
                return event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
        {\r
                return event_subject_.unsubscribe(o);\r
        }\r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 6c50ac614d8435c0b6c613b2029770c8eb71e5aa..56339eeb2b8e8b5edfb3eda6e8802fea9e5ecd0c 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -77,8 +77,8 @@ public:
        \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
+       void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 \r
        // Properties\r
 \r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index cea84969d0e5bf99262a63f27888a4839d828c3a..6e7b7858b3aec531bb255a37672f5194acdc7b0d 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -62,12 +62,12 @@ public:
        \r
        // frame_producer\r
                \r
-       virtual void leading_producer(const spl::shared_ptr<frame_producer>& producer) override\r
+       void leading_producer(const spl::shared_ptr<frame_producer>& producer) override\r
        {\r
                source_producer_ = create_destroy_proxy(producer);\r
        }\r
 \r
-       virtual draw_frame receive(int flags) override\r
+       draw_frame receive(int flags) override\r
        {\r
                if(current_frame_ >= info_.duration)\r
                {\r
@@ -111,32 +111,32 @@ public:
                return compose(dest, source);\r
        }\r
 \r
-       virtual draw_frame last_frame() const override\r
+       draw_frame last_frame() const override\r
        {\r
                return dest_producer_->last_frame();\r
        }\r
        \r
-       virtual uint32_t nb_frames() const override\r
+       uint32_t nb_frames() const override\r
        {\r
                return dest_producer_->nb_frames();\r
        }\r
 \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"transition[" + source_producer_->print() + L"=>" + dest_producer_->print() + L"]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"transition";\r
        }\r
        \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                return dest_producer_->info();\r
        }\r
        \r
-       virtual boost::unique_future<std::wstring> call(const std::wstring& str) override\r
+       boost::unique_future<std::wstring> call(const std::wstring& str) override\r
        {\r
                return dest_producer_->call(str);\r
        }\r
@@ -200,12 +200,12 @@ public:
                return draw_frame::over(s_frame, d_frame);\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
+       void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
        {\r
                event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
        {\r
                event_subject_.unsubscribe(o);\r
        }\r

diff --git a/core/video_channel.h b/core/video_channel.h
index b0bf8da4f51cedd7b77121465fc8aa95ccc83919..32048a7f07ead999885e9f50e7e31b1f985c70e3 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -56,8 +56,8 @@ public:
                        \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
+       void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 \r
        // Properties\r
 \r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 056c44a03483ae0ebc032a963dc43bcf620069c9..90782a517dfabe6851c0443ff26dfe8837d1c1bc 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -311,29 +311,29 @@ public:
        \r
        // frame_consumer\r
        \r
-       virtual void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
+       void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
        {\r
                consumer_.reset();\r
                consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_, key_only_, channel_index));\r
        }\r
        \r
-       virtual bool send(core::const_frame frame) override\r
+       bool send(core::const_frame frame) override\r
        {\r
                consumer_->send(frame);\r
                return true;\r
        }\r
                \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return consumer_ ? consumer_->print() : L"[bluefish_consumer]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"bluefish";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"bluefish");\r
@@ -348,7 +348,7 @@ public:
                return 1;\r
        }\r
        \r
-       virtual int index() const override\r
+       int index() const override\r
        {\r
                return 400 + device_index_;\r
        }\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 74f5d8d0d7ee8b72b5391165e035039ae2fbe252..a628eb455b5edd258ac5c15219b5fbcdca56596e 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -508,7 +508,7 @@ public:
 \r
        // frame_consumer\r
        \r
-       virtual void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
+       void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
        {\r
                executor_.invoke([=]\r
                {\r
@@ -517,23 +517,23 @@ public:
                });\r
        }\r
        \r
-       virtual bool send(core::const_frame frame) override\r
+       bool send(core::const_frame frame) override\r
        {\r
                consumer_->send(frame);\r
                return true;\r
        }\r
        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return consumer_ ? consumer_->print() : L"[decklink_consumer]";\r
        }               \r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"decklink";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"decklink");\r
@@ -546,12 +546,12 @@ public:
                return info;\r
        }\r
 \r
-       virtual int buffer_depth() const override\r
+       int buffer_depth() const override\r
        {\r
                return config_.buffer_depth();\r
        }\r
 \r
-       virtual int index() const override\r
+       int index() const override\r
        {\r
                return 300 + config_.device_index;\r
        }\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index cf0701c5eafedacf71428c203dd4854666c0ffd2..f205123a48f61f5d8018103c2ca7b6872669a677 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -337,19 +337,19 @@ public:
                });\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override\r
+       void subscribe(const monitor::observable::observer_ptr& o) override\r
        {\r
                producer_->subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override\r
        {\r
                producer_->unsubscribe(o);\r
        }\r
        \r
        // frame_producer\r
                                \r
-       virtual core::draw_frame receive(int flags) override\r
+       core::draw_frame receive(int flags) override\r
        {\r
                auto frame = producer_->get_frame(flags);\r
 \r
@@ -359,27 +359,27 @@ public:
                return frame;\r
        }\r
 \r
-       virtual core::draw_frame last_frame() const override\r
+       core::draw_frame last_frame() const override\r
        {\r
                return core::draw_frame::still(last_frame_);\r
        }\r
                \r
-       virtual uint32_t nb_frames() const override\r
+       uint32_t nb_frames() const override\r
        {\r
                return length_;\r
        }\r
        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return producer_->print();\r
        }\r
        \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"decklink";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"decklink");\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 89986df40bf0dbaca0bc11dd6531bc8a008258f6..276ddebe176a0c68a35cd555a39f1722e4dacba6 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -669,23 +669,23 @@ public:
                consumer_.reset(new ffmpeg_consumer(u8(filename_), format_desc, options_));\r
        }\r
        \r
-       virtual bool send(core::const_frame frame) override\r
+       bool send(core::const_frame frame) override\r
        {\r
                consumer_->send(frame);\r
                return true;\r
        }\r
        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return consumer_ ? consumer_->print() : L"[ffmpeg_consumer]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"file";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"file");\r
@@ -693,17 +693,17 @@ public:
                return info;\r
        }\r
                \r
-       virtual bool has_synchronization_clock() const override\r
+       bool has_synchronization_clock() const override\r
        {\r
                return false;\r
        }\r
 \r
-       virtual int buffer_depth() const override\r
+       int buffer_depth() const override\r
        {\r
                return 1;\r
        }\r
 \r
-       virtual int index() const override\r
+       int index() const override\r
        {\r
                return 200;\r
        }\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 7763c5329bcd828f1cedae66b2896c15f09d798a..b03a3cfe26fb4fb82f8d433273747f46cb92144b 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -59,8 +59,8 @@ public:
        \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
+       void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 \r
 private:\r
        struct impl;\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index ecb9ec9ebd600e9cc4345f8c03eb2a26f4363154..cb4a671b83b7bb1ebe4f475f5f6404d6cd56a291 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -150,7 +150,7 @@ public:
 \r
        // frame_producer\r
        \r
-       virtual core::draw_frame receive(int flags) override\r
+       core::draw_frame receive(int flags) override\r
        {                               \r
                boost::timer frame_timer;\r
                                \r
@@ -183,12 +183,12 @@ public:
                return frame;\r
        }\r
 \r
-       virtual core::draw_frame last_frame() const override\r
+       core::draw_frame last_frame() const override\r
        {\r
                return core::draw_frame::still(last_frame_);\r
        }\r
        \r
-       virtual uint32_t nb_frames() const override\r
+       uint32_t nb_frames() const override\r
        {\r
                if(input_.loop())\r
                        return std::numeric_limits<uint32_t>::max();\r
@@ -214,21 +214,21 @@ public:
                return video_decoder_ ? video_decoder_->file_frame_number() : 0;\r
        }\r
        \r
-       virtual boost::unique_future<std::wstring> call(const std::wstring& param) override\r
+       boost::unique_future<std::wstring> call(const std::wstring& param) override\r
        {\r
                boost::promise<std::wstring> promise;\r
                promise.set_value(do_call(param));\r
                return promise.get_future();\r
        }\r
                                \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"ffmpeg[" + boost::filesystem::path(filename_).filename().wstring() + L"|" \r
                                                  + print_mode() + L"|" \r
                                                  + boost::lexical_cast<std::wstring>(file_frame_number()) + L"/" + boost::lexical_cast<std::wstring>(file_nb_frames()) + L"]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"ffmpeg";\r
        }\r
@@ -251,12 +251,12 @@ public:
                return info;\r
        }\r
        \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override\r
+       void subscribe(const monitor::observable::observer_ptr& o) override\r
        {\r
                event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override\r
        {\r
                event_subject_.unsubscribe(o);\r
        }\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 42cca6284c168414bea88a91ba510d6551459e3e..ca1d3fac882ac3013e4a282a8820aedf5ef94601 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -56,8 +56,8 @@ public:
        \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
+       void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 \r
 private:\r
        struct impl;\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 108881df71594efa21a5b427eb78ce9399e4ddc5..234e3acf7728fdb5d3465f0141b0efe415b21dff 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -375,7 +375,7 @@ public:
 \r
        // frame_producer\r
                \r
-       virtual core::draw_frame receive(int) override\r
+       core::draw_frame receive(int) override\r
        {                                       \r
                auto frame = core::draw_frame::late();\r
                \r
@@ -396,12 +396,12 @@ public:
                return frame;\r
        }\r
 \r
-       virtual core::draw_frame last_frame() const override\r
+       core::draw_frame last_frame() const override\r
        {\r
                return core::draw_frame::still(last_frame_);\r
        }\r
        \r
-       virtual boost::unique_future<std::wstring> call(const std::wstring& param) override\r
+       boost::unique_future<std::wstring> call(const std::wstring& param) override\r
        {       \r
                return executor_.begin_invoke([this, param]() -> std::wstring\r
                {                       \r
@@ -427,29 +427,29 @@ public:
                });\r
        }\r
                \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        { \r
                return L"flash[" + boost::filesystem::path(filename_).wstring() + L"|" + boost::lexical_cast<std::wstring>(fps_) + L"]";                \r
        }       \r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"flash";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"flash");\r
                return info;\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override\r
+       void subscribe(const monitor::observable::observer_ptr& o) override\r
        {\r
                event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override\r
        {\r
                event_subject_.unsubscribe(o);\r
        }\r

diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index e15c43b9bdebd2d8d621855d738fea8348293c71..de7bc065388a85af2df862793a8972d7b9f0936d 100644 (file)
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -50,11 +50,11 @@ public:
 \r
        // frame_consumer\r
 \r
-       virtual void initialize(const core::video_format_desc&, int) override\r
+       void initialize(const core::video_format_desc&, int) override\r
        {\r
        }\r
        \r
-       virtual bool send(core::const_frame frame) override\r
+       bool send(core::const_frame frame) override\r
        {                               \r
                boost::thread async([frame]\r
                {\r
@@ -77,29 +77,29 @@ public:
                return false;\r
        }\r
 \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"image[]";\r
        }\r
        \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"image";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"image");\r
                return info;\r
        }\r
 \r
-       virtual int buffer_depth() const override\r
+       int buffer_depth() const override\r
        {\r
                return 0;\r
        }\r
 \r
-       virtual int index() const override\r
+       int index() const override\r
        {\r
                return 100;\r
        }\r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index f7ec87f8a7e5247016aa3416afcfbb57fb0fb4bb..1d950aeb81566cf12f060298fdcf6cf566b361dd 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -71,29 +71,29 @@ struct image_producer : public core::frame_producer
        \r
        // frame_producer\r
 \r
-       virtual core::draw_frame receive(int) override\r
+       core::draw_frame receive(int) override\r
        {\r
                event_subject_ << monitor::event("file/path") % filename_;\r
 \r
                return frame_;\r
        }\r
 \r
-       virtual core::draw_frame last_frame() const override\r
+       core::draw_frame last_frame() const override\r
        {\r
                return frame_;\r
        }\r
                \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"image_producer[" + filename_ + L"]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"image";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"image");\r
@@ -101,12 +101,12 @@ struct image_producer : public core::frame_producer
                return info;\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
+       void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
        {\r
                return event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
        {\r
                return event_subject_.unsubscribe(o);\r
        }\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 947ba071fea4f69ff33cab3bd17c03cabd943200..f98f9b76891f2e0a5bfbe92213b5e9fe5205e6dc 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -162,7 +162,7 @@ struct image_scroll_producer : public core::frame_producer
        \r
        // frame_producer\r
 \r
-       virtual core::draw_frame receive(int) override\r
+       core::draw_frame receive(int) override\r
        {               \r
                delta_ += speed_;\r
 \r
@@ -199,22 +199,22 @@ struct image_scroll_producer : public core::frame_producer
                return last_frame_ = core::draw_frame(frames_);\r
        }\r
 \r
-       virtual core::draw_frame last_frame() const override\r
+       core::draw_frame last_frame() const override\r
        {\r
                return core::draw_frame::still(last_frame_);\r
        }\r
                        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"image_scroll_producer[" + filename_ + L"]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"image-scroll";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"image-scroll");\r
@@ -222,7 +222,7 @@ struct image_scroll_producer : public core::frame_producer
                return info;\r
        }\r
 \r
-       virtual uint32_t nb_frames() const override\r
+       uint32_t nb_frames() const override\r
        {\r
                if(height_ > format_desc_.height)\r
                {\r
@@ -237,12 +237,12 @@ struct image_scroll_producer : public core::frame_producer
                }\r
        }\r
 \r
-       virtual void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
+       void subscribe(const monitor::observable::observer_ptr& o) override                                                                                                                     \r
        {\r
                return event_subject_.subscribe(o);\r
        }\r
 \r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override           \r
        {\r
                return event_subject_.unsubscribe(o);\r
        }\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index d95f117e0cc5177ffb94ddedeaa489bb500a2016..31a4bef0eb0dd29691ad48db2ce33556c146b397 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -83,7 +83,7 @@ public:
 \r
        // frame consumer\r
 \r
-       virtual void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
+       void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
        {\r
                format_desc_    = format_desc;          \r
                channel_index_  = channel_index;\r
@@ -96,7 +96,7 @@ public:
                }\r
        }\r
        \r
-       virtual bool send(core::const_frame frame) override\r
+       bool send(core::const_frame frame) override\r
        {                       \r
                if(!input_.try_push(std::make_shared<audio_buffer_16>(core::audio_32_to_16(frame.audio_data()))))\r
                        graph_->set_tag("dropped-frame");\r
@@ -104,36 +104,36 @@ public:
                return true;\r
        }\r
        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return L"oal[" + boost::lexical_cast<std::wstring>(channel_index_) + L"|" + format_desc_.name + L"]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"system-audio";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"system-audio");\r
                return info;\r
        }\r
        \r
-       virtual bool has_synchronization_clock() const override\r
+       bool has_synchronization_clock() const override\r
        {\r
                return false;\r
        }\r
        \r
-       virtual int buffer_depth() const override\r
+       int buffer_depth() const override\r
        {\r
                return 3;\r
        }\r
 \r
        // oal_consumer\r
        \r
-       virtual bool OnGetData(sf::SoundStream::Chunk& data) override\r
+       bool OnGetData(sf::SoundStream::Chunk& data) override\r
        {               \r
                std::shared_ptr<audio_buffer_16> audio_data;            \r
                input_.pop(audio_data);\r
@@ -148,7 +148,7 @@ public:
                return is_running_;\r
        }\r
 \r
-       virtual int index() const override\r
+       int index() const override\r
        {\r
                return 500;\r
        }\r

diff --git a/modules/reroute/producer/reroute_producer.cpp b/modules/reroute/producer/reroute_producer.cpp
index b3b318103b42818cdc4c02e089fe0e1617160c18..e31c00983de429f2f20be2d3f4b39d8a68e7d833 100644 (file)
--- a/modules/reroute/producer/reroute_producer.cpp
+++ b/modules/reroute/producer/reroute_producer.cpp
@@ -81,7 +81,7 @@ namespace caspar { namespace reroute {
 //\r
 //     // frame_producer\r
 //                     \r
-//     virtual core::draw_frame receive(int) override\r
+//     core::draw_frame receive(int) override\r
 //     {\r
 //             if(!frame_buffer_.empty())\r
 //             {\r
@@ -120,22 +120,22 @@ namespace caspar { namespace reroute {
 //             return receive(0);\r
 //     }       \r
 //\r
-//     virtual core::draw_frame last_frame() const override\r
+//     core::draw_frame last_frame() const override\r
 //     {\r
 //             return core::draw_frame::still(last_frame_);\r
 //     }\r
 //     \r
-//     virtual std::wstring print() const override\r
+//     std::wstring print() const override\r
 //     {\r
 //             return L"reroute[]";\r
 //     }\r
 //\r
-//     virtual std::wstring name() const override\r
+//     std::wstring name() const override\r
 //     {\r
 //             return L"reroute";\r
 //     }\r
 //\r
-//     virtual boost::property_tree::wptree info() const override\r
+//     boost::property_tree::wptree info() const override\r
 //     {\r
 //             boost::property_tree::wptree info;\r
 //             info.add(L"type", L"rerotue-producer");\r

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index 393bfa74e8cb002e920dd5df8f30db287c6e9d5d..3a92120fd3e87f32d192a6673381ef545a3866b8 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -474,28 +474,28 @@ public:
        \r
        // frame_consumer\r
 \r
-       virtual void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
+       void initialize(const core::video_format_desc& format_desc, int channel_index) override\r
        {\r
                consumer_.reset();\r
                consumer_.reset(new screen_consumer(config_, format_desc, channel_index));\r
        }\r
        \r
-       virtual bool send(core::const_frame frame) override\r
+       bool send(core::const_frame frame) override\r
        {\r
                return consumer_->send(frame);\r
        }\r
        \r
-       virtual std::wstring print() const override\r
+       std::wstring print() const override\r
        {\r
                return consumer_ ? consumer_->print() : L"[screen_consumer]";\r
        }\r
 \r
-       virtual std::wstring name() const override\r
+       std::wstring name() const override\r
        {\r
                return L"screen";\r
        }\r
 \r
-       virtual boost::property_tree::wptree info() const override\r
+       boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"type", L"screen");\r
@@ -505,17 +505,17 @@ public:
                return info;\r
        }\r
 \r
-       virtual bool has_synchronization_clock() const override\r
+       bool has_synchronization_clock() const override\r
        {\r
                return false;\r
        }\r
        \r
-       virtual int buffer_depth() const override\r
+       int buffer_depth() const override\r
        {\r
                return 2;\r
        }\r
 \r
-       virtual int index() const override\r
+       int index() const override\r
        {\r
                return 600;\r
        }\r

diff --git a/protocol/osc/server.h b/protocol/osc/server.h
index 508a91288463be39882c470ca3d5ba3cccc4bf02..59b4d5e3e55fbb995e731f3f997be533d1f3f54c 100644 (file)
--- a/protocol/osc/server.h
+++ b/protocol/osc/server.h
@@ -13,7 +13,7 @@ class server : public reactive::observer<monitor::event>
 public:        \r
        server(unsigned short port);\r
        \r
-       virtual void on_next(const monitor::event& e) override;\r
+       void on_next(const monitor::event& e) override;\r
 private:\r
        spl::shared_ptr<observer<monitor::event>> impl_;\r
 };\r

diff --git a/shell/server.h b/shell/server.h
index 08b7ad27cc7c901e68839f3717818408ae88723d..74571dbf00c4708330e8c4fe6be979db593931c2 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -44,8 +44,8 @@ public:
 \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
+       void subscribe(const monitor::observable::observer_ptr& o) override;\r
+       void unsubscribe(const monitor::observable::observer_ptr& o) override;\r
 private:\r
        struct impl;\r
        spl::shared_ptr<impl> impl_;\r