From 39e88846839e9e016220f97d89421907e9c013bb Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 7 May 2017 12:36:26 +0200 Subject: [PATCH] Fix a few Clang warnings. --- core/producer/cg_proxy.cpp | 2 +- core/producer/frame_producer.cpp | 4 ++-- core/producer/scene/const_producer.cpp | 2 +- core/producer/scene/scene_producer.h | 2 +- core/producer/separated/separated_producer.cpp | 4 ++-- core/producer/text/text_producer.h | 2 +- core/producer/transition/transition_producer.cpp | 2 +- modules/decklink/consumer/decklink_consumer.cpp | 2 +- modules/decklink/producer/decklink_producer.cpp | 2 +- modules/image/producer/image_producer.cpp | 2 +- modules/image/producer/image_scroll_producer.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/producer/cg_proxy.cpp b/core/producer/cg_proxy.cpp index bda54ae77..398cbfaf3 100644 --- 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& 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 a84008480..6d843d270 100644 --- a/core/producer/frame_producer.cpp +++ b/core/producer/frame_producer.cpp @@ -192,7 +192,7 @@ const spl::shared_ptr& frame_producer::empty() std::future call(const std::vector& params) override{CASPAR_THROW_EXCEPTION(not_implemented());} variable& get_variable(const std::wstring& name) override { CASPAR_THROW_EXCEPTION(not_implemented()); } const std::vector& get_variables() const override { static std::vector 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& get_variables() const override {return producer_->get_variables();} void leading_producer(const spl::shared_ptr& 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 8a5588121..317fef8d4 100644 --- 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 08b2e7fb6..05609ab23 100644 --- 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 call(const std::vector& 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& 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 ddcf22931..ec9e4098a 100644 --- 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 create_separated_producer(const spl::shared_ptr& fill, const spl::shared_ptr& key) diff --git a/core/producer/text/text_producer.h b/core/producer/text/text_producer.h index 85eeb8769..63c5db6f0 100644 --- 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& text(); binding& tracking(); diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp index 9b454d82b..c2575cf61 100644 --- 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 6825c8c2c..f7bc57335 100644 --- a/modules/decklink/consumer/decklink_consumer.cpp +++ b/modules/decklink/consumer/decklink_consumer.cpp @@ -753,7 +753,7 @@ public: return consumer_ ? static_cast(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 d1753f71e..a111b291a 100644 --- 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 6e45f9434..fdd67331e 100644 --- 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 11fc40738..16a8ccfc5 100644 --- 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_; } -- 2.39.2