\r
std::vector<const producer_factory_t> g_factories;\r
\r
+void register_producer_factory(const producer_factory_t& factory)\r
+{\r
+ g_factories.push_back(factory);\r
+}\r
+\r
boost::unique_future<std::wstring> frame_producer::call(const std::wstring&) \r
{\r
BOOST_THROW_EXCEPTION(not_supported());\r
}\r
\r
+const spl::shared_ptr<frame_producer>& frame_producer::empty() // nothrow\r
+{\r
+\r
struct empty_frame_producer : public frame_producer\r
{\r
virtual spl::shared_ptr<draw_frame> receive(int){return draw_frame::empty();}\r
virtual void set_frame_factory(const spl::shared_ptr<frame_factory>&){}\r
virtual uint32_t nb_frames() const {return 0;}\r
virtual std::wstring print() const { return L"empty";}\r
+ virtual void subscribe(const monitor::observable::observer_ptr& o){}\r
+ 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
{\r
}\r
};\r
\r
-const spl::shared_ptr<frame_producer>& frame_producer::empty() // nothrow\r
-{\r
static spl::shared_ptr<frame_producer> producer = spl::make_shared<empty_frame_producer>();\r
return producer;\r
} \r
\r
-spl::shared_ptr<draw_frame> receive_and_follow(spl::shared_ptr<frame_producer>& producer, int hints)\r
-{ \r
- auto frame = producer->receive(hints);\r
- if(frame == draw_frame::eof())\r
- {\r
- CASPAR_LOG(info) << producer->print() << " End Of File.";\r
- auto following = producer->get_following_producer();\r
- if(following != frame_producer::empty())\r
- {\r
- following->set_leading_producer(producer);\r
- producer = std::move(following);\r
- }\r
-\r
- return receive_and_follow(producer, hints);\r
- }\r
- return frame;\r
-}\r
-\r
-void register_producer_factory(const producer_factory_t& factory)\r
-{\r
- g_factories.push_back(factory);\r
-}\r
-\r
-class destroy_producer_proxy : public frame_producer\r
+class producer_proxy : public frame_producer\r
{ \r
- std::unique_ptr<std::shared_ptr<frame_producer>> producer_;\r
+ std::shared_ptr<frame_producer> producer_;\r
public:\r
- destroy_producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
- : producer_(new std::shared_ptr<frame_producer>(std::move(producer)))\r
+ producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
+ : producer_(std::move(producer))\r
{\r
+ CASPAR_LOG(info) << producer_->print() << L" Initialized.";\r
}\r
\r
- ~destroy_producer_proxy()\r
+ virtual ~producer_proxy()\r
{ \r
static tbb::atomic<int> counter = tbb::atomic<int>();\r
\r
++counter;\r
CASPAR_VERIFY(counter < 32);\r
\r
- auto producer = producer_.release();\r
+ auto producer = new spl::shared_ptr<frame_producer>(std::move(producer_));\r
async([=]\r
{\r
- std::unique_ptr<std::shared_ptr<frame_producer>> pointer_guard(producer);\r
-\r
+ std::unique_ptr<spl::shared_ptr<frame_producer>> pointer_guard(producer);\r
auto str = (*producer)->print();\r
try\r
{\r
CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";\r
}\r
catch(...){}\r
-\r
+ \r
+ CASPAR_LOG(trace) << str << L" Uninitializing.";\r
pointer_guard.reset();\r
+ CASPAR_LOG(info) << str << L" Uninitialized.";\r
\r
--counter;\r
}); \r
}\r
-\r
- virtual spl::shared_ptr<draw_frame> receive(int hints) override {return (*producer_)->receive(hints);}\r
- virtual spl::shared_ptr<draw_frame> last_frame() const override {return (*producer_)->last_frame();}\r
- virtual std::wstring print() const override {return (*producer_)->print();}\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 spl::shared_ptr<frame_producer> get_following_producer() const override {return (*producer_)->get_following_producer();}\r
- virtual void set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override {(*producer_)->set_leading_producer(producer);}\r
- virtual uint32_t nb_frames() const override {return (*producer_)->nb_frames();}\r
+ \r
+ virtual spl::shared_ptr<draw_frame> receive(int flags) override {return producer_->receive(flags);}\r
+ virtual spl::shared_ptr<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
+ 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
\r
-class print_producer_proxy : public frame_producer\r
-{ \r
- std::shared_ptr<frame_producer> producer_;\r
-public:\r
- print_producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
- : producer_(std::move(producer))\r
- {\r
- CASPAR_LOG(info) << producer_->print() << L" Initialized.";\r
- }\r
-\r
- ~print_producer_proxy()\r
- { \r
- auto str = producer_->print();\r
- CASPAR_LOG(trace) << str << L" Uninitializing.";\r
- producer_.reset();\r
- CASPAR_LOG(info) << str << L" Uninitialized.";\r
- }\r
-\r
- virtual spl::shared_ptr<draw_frame> receive(int hints) override {return (producer_)->receive(hints);}\r
- virtual spl::shared_ptr<draw_frame> last_frame() const override {return (producer_)->last_frame();}\r
- virtual std::wstring print() const override {return (producer_)->print();}\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 spl::shared_ptr<frame_producer> get_following_producer() const override {return (producer_)->get_following_producer();}\r
- virtual void set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override {(producer_)->set_leading_producer(producer);}\r
- virtual uint32_t nb_frames() const override {return (producer_)->nb_frames();}\r
-};\r
+spl::shared_ptr<core::frame_producer> wrap_producer(spl::shared_ptr<core::frame_producer> producer)\r
+{\r
+ return spl::make_shared<producer_proxy>(std::move(producer));\r
+}\r
\r
spl::shared_ptr<core::frame_producer> do_create_producer(const spl::shared_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
{\r
if(producer == frame_producer::empty())\r
return producer;\r
\r
- return spl::make_shared<destroy_producer_proxy>(\r
- spl::make_shared<print_producer_proxy>(\r
- std::move(producer)));\r
+ return producer;\r
}\r
\r
spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
projects / casparcg / blobdiff