2.1.0: Don't use virtual for override functions.

[casparcg] / modules / image / producer / image_scroll_producer.cpp

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