X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fproducer%2Fframe_producer.cpp;h=bfc00d4e338ae4cef9c1a97386fd81364ba5d018;hb=99ee141d02252abc02911c31516b37dc7d551126;hp=2312605de47367ee3ca400f862cd57375d59d537;hpb=54dc91d51744f8d9db48b84f2a461bd25a1dbee0;p=casparcg diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp index 2312605de..bfc00d4e3 100644 --- a/core/producer/frame_producer.cpp +++ b/core/producer/frame_producer.cpp @@ -66,7 +66,7 @@ const spl::shared_ptr& frame_producer::empty() virtual void unsubscribe(const monitor::observable::observer_ptr& o){} virtual std::wstring name() const {return L"empty";} - virtual boost::property_tree::wptree info() const override + boost::property_tree::wptree info() const override { boost::property_tree::wptree info; info.add(L"type", L"empty-producer"); @@ -118,14 +118,14 @@ public: }).detach(); } - virtual draw_frame receive(int flags) override {return producer_->receive(flags);} - virtual draw_frame last_frame() const override {return producer_->last_frame();} - virtual std::wstring print() const override {return producer_->print();} - virtual std::wstring name() const override {return producer_->name();} - virtual boost::property_tree::wptree info() const override {return producer_->info();} - virtual boost::unique_future call(const std::wstring& str) override {return producer_->call(str);} - virtual void leading_producer(const spl::shared_ptr& producer) override {return producer_->leading_producer(producer);} - virtual uint32_t nb_frames() const override {return producer_->nb_frames();} + draw_frame receive(int flags) override {return producer_->receive(flags);} + draw_frame last_frame() const override {return producer_->last_frame();} + std::wstring print() const override {return producer_->print();} + std::wstring name() const override {return producer_->name();} + boost::property_tree::wptree info() const override {return producer_->info();} + boost::unique_future call(const std::wstring& str) override {return producer_->call(str);} + void leading_producer(const spl::shared_ptr& producer) override {return producer_->leading_producer(producer);} + uint32_t nb_frames() const override {return producer_->nb_frames();} virtual void subscribe(const monitor::observable::observer_ptr& o) {return producer_->subscribe(o);} virtual void unsubscribe(const monitor::observable::observer_ptr& o) {return producer_->unsubscribe(o);} };