- struct empty_frame_producer : public frame_producer\r
- {\r
- virtual safe_ptr<basic_frame> receive(){return basic_frame::empty();}\r
- virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
- virtual std::wstring print() const { return L"empty";}\r
- };\r
- static safe_ptr<frame_producer> producer = make_safe<empty_frame_producer>();\r
- return producer;\r
-} \r
+ safe_ptr<frame_producer> producer_;\r
+ executor& destroy_context_;\r
+public:\r
+ destroy_producer_proxy(executor& destroy_context, const safe_ptr<frame_producer>& producer) \r
+ : producer_(producer)\r
+ , destroy_context_(destroy_context){}\r
+\r
+ ~destroy_producer_proxy()\r
+ { \r
+ if(destroy_context_.size() > 4)\r
+ CASPAR_LOG(error) << L" Potential destroyer deadlock.";\r
+\r
+ // Hacks to bypass compiler bugs.\r
+ auto mov_producer = make_move_on_copy<safe_ptr<frame_producer>>(std::move(producer_));\r
+ auto empty_producer = frame_producer::empty();\r
+ destroy_context_.begin_invoke([=]\r
+ { \r
+ //if(!mov_producer.value.unique())\r
+ // CASPAR_LOG(debug) << mov_producer.value->print() << L" Not destroyed on safe asynchronous destruction thread.";\r
+ //else\r
+ // CASPAR_LOG(debug) << mov_producer.value->print() << L" Destroying on safe asynchronous destruction thread.";\r
+ \r
+ mov_producer.value = empty_producer;\r
+ });\r
+ }\r