Fix a few Clang warnings.

diff --git a/core/producer/cg_proxy.cpp b/core/producer/cg_proxy.cpp
index bda54ae771fcd9a6ced34d736f5b6f5055158a1d..398cbfaf3921d47b74ad33fceb0b09f91c6999c4 100644 (file)
--- a/core/producer/cg_proxy.cpp
+++ b/core/producer/cg_proxy.cpp
@@ -395,7 +395,7 @@ public:
        boost::property_tree::wptree            info() const override                                                                                                           { return producer_->info(); }
        void                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override      { return producer_->leading_producer(producer); }
        uint32_t                                                        nb_frames() const override                                                                                                      { return producer_->nb_frames(); }
-       draw_frame                                                      last_frame()                                                                                                                            { return producer_->last_frame(); }
+       draw_frame                                                      last_frame() override                                                                                                                   { return producer_->last_frame(); }
        monitor::subject&                                       monitor_output() override                                                                                                       { return producer_->monitor_output(); }
        bool                                                            collides(double x, double y) const override                                                                     { return producer_->collides(x, y); }
        void                                                            on_interaction(const interaction_event::ptr& event)     override                                { return producer_->on_interaction(event); }

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index a840084800933eb282bedcdb292dabd857e76b73..6d843d270b59137927ad4e2e2c0da164e78d867f 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -192,7 +192,7 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty()
                std::future<std::wstring> call(const std::vector<std::wstring>& params) override{CASPAR_THROW_EXCEPTION(not_implemented());}
                variable& get_variable(const std::wstring& name) override { CASPAR_THROW_EXCEPTION(not_implemented()); }
                const std::vector<std::wstring>& get_variables() const override { static std::vector<std::wstring> empty; return empty; }
-               draw_frame last_frame() {return draw_frame::empty();}
+               draw_frame last_frame() override {return draw_frame::empty();}
                constraints& pixel_constraints() override { static constraints c; return c; }
 
                boost::property_tree::wptree info() const override
@@ -293,7 +293,7 @@ public:
        const std::vector<std::wstring>&                                        get_variables() const override                                                                                                  {return producer_->get_variables();}
        void                                                                                            leading_producer(const spl::shared_ptr<frame_producer>& producer) override              {return producer_->leading_producer(producer);}
        uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}
-       draw_frame                                                                                      last_frame()                                                                                                                                    {return producer_->last_frame();}
+       draw_frame                                                                                      last_frame() override                                                                                                                                   {return producer_->last_frame();}
        monitor::subject&                                                                       monitor_output() override                                                                                                               {return producer_->monitor_output();}
        bool                                                                                            collides(double x, double y) const override                                                                             {return producer_->collides(x, y);}
        void                                                                                            on_interaction(const interaction_event::ptr& event)     override                                        {return producer_->on_interaction(event);}

diff --git a/core/producer/scene/const_producer.cpp b/core/producer/scene/const_producer.cpp
index 8a5588121a8d559f68119977e8094b335835d47f..317fef8d4a1df4c53175a8be5f76e1db163abf48 100644 (file)
--- a/core/producer/scene/const_producer.cpp
+++ b/core/producer/scene/const_producer.cpp
@@ -83,7 +83,7 @@ public:
                return info;
        }
 
-       monitor::subject& monitor_output()
+       monitor::subject& monitor_output() override
        {
                return monitor_subject_;
        }

diff --git a/core/producer/scene/scene_producer.h b/core/producer/scene/scene_producer.h
index 08b2e7fb6f704d0608ef996846facac3c2445954..05609ab231842f30d6e0d33c1b4f4ac8df67fc48 100644 (file)
--- a/core/producer/scene/scene_producer.h
+++ b/core/producer/scene/scene_producer.h
@@ -143,7 +143,7 @@ public:
        std::wstring name() const override;
        std::future<std::wstring> call(const std::vector<std::wstring>& params) override;
        boost::property_tree::wptree info() const override;
-       monitor::subject& monitor_output();
+       monitor::subject& monitor_output() override;
 
        layer& create_layer(
                        const spl::shared_ptr<frame_producer>& producer, int x, int y, const std::wstring& name);

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index ddcf2293161149d83511585499ef17b27e6fbe75..ec9e4098acd1a0419d59d3224c1f9e7e27500d6c 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -83,7 +83,7 @@ public:
                return frame;
        }
 
-       draw_frame last_frame()
+       draw_frame last_frame() override
        {
                return draw_frame::mask(fill_producer_->last_frame(), key_producer_->last_frame());
        }
@@ -119,7 +119,7 @@ public:
                return fill_producer_->info();;
        }
 
-       monitor::subject& monitor_output() { return *monitor_subject_; }
+       monitor::subject& monitor_output() override { return *monitor_subject_; }
 };
 
 spl::shared_ptr<frame_producer> create_separated_producer(const spl::shared_ptr<frame_producer>& fill, const spl::shared_ptr<frame_producer>& key)

diff --git a/core/producer/text/text_producer.h b/core/producer/text/text_producer.h
index 85eeb876910ff91fdea58253b409240960b794ca..63c5db6f03e7afa208664316ce89d237561c196b 100644 (file)
--- a/core/producer/text/text_producer.h
+++ b/core/producer/text/text_producer.h
@@ -58,7 +58,7 @@ public:
        std::wstring print() const override;
        std::wstring name() const override;
        boost::property_tree::wptree info() const override;
-       monitor::subject& monitor_output();
+       monitor::subject& monitor_output() override;
 
        binding<std::wstring>& text();
        binding<double>& tracking();

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 9b454d82b687caeea420d9c67344a8036585fd3d..c2575cf618f9fa631e735e88e99a89f98131c54c 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -215,7 +215,7 @@ public:
                return draw_frame::over(s_frame, d_frame);
        }
 
-       monitor::subject& monitor_output()
+       monitor::subject& monitor_output() override
        {
                return *monitor_subject_;
        }

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 6825c8c2c4e43971dd6a6999f582dc80a04874ef..f7bc57335afdd35de9343760c3a5964efe69e401 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -753,7 +753,7 @@ public:
                return consumer_ ? static_cast<int64_t>(consumer_->current_presentation_delay_) : 0;
        }
 
-       core::monitor::subject& monitor_output()
+       core::monitor::subject& monitor_output() override
        {
                return monitor_subject_;
        }

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index d1753f71eeb79a45483bfa070d13aee81740a786..a111b291a1d5242c4d1173419547a04f7366b8d4 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -384,7 +384,7 @@ public:
                });
        }
 
-       core::monitor::subject& monitor_output()
+       core::monitor::subject& monitor_output() override
        {
                return producer_->monitor_output();
        }

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 6e45f9434730cec8acfd0c488848d808104032ea..fdd67331e004769d501a818c6a587395cb6b621a 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -163,7 +163,7 @@ struct image_producer : public core::frame_producer_base
                return info;
        }
 
-       core::monitor::subject& monitor_output()
+       core::monitor::subject& monitor_output() override
        {
                return monitor_subject_;
        }

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 11fc4073861027cc9e45e4f309ba7a2adcef0573..16a8ccfc59b55ede1c23c6bbba40c45ab39fa8b6 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -482,7 +482,7 @@ struct image_scroll_producer : public core::frame_producer_base
                }
        }
 
-       core::monitor::subject& monitor_output()
+       core::monitor::subject& monitor_output() override
        {
                return monitor_subject_;
        }