]> git.sesse.net Git - casparcg/commitdiff
2.1.0: Use "boost::thread(...).detach()" instead of "async" for destruction proxies.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 20 Feb 2012 12:38:10 +0000 (12:38 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 20 Feb 2012 12:38:10 +0000 (12:38 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2470 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

core/consumer/frame_consumer.cpp
core/producer/frame_producer.cpp

index 86024352997b40a98265988765ffe08b5e1157a4..cb3b5f4cf9533961f70d5b8bf369fe5e54c5a161 100644 (file)
@@ -28,7 +28,7 @@
 #include <core/video_format.h>\r
 #include <core/frame/frame.h>\r
 \r
-#include <common/future.h>\r
+#include <boost/thread.hpp>\r
 \r
 namespace caspar { namespace core {\r
                \r
@@ -56,7 +56,7 @@ public:
                CASPAR_VERIFY(counter < 32);\r
                \r
                auto consumer = new std::shared_ptr<frame_consumer>(std::move(consumer_));\r
-               async(launch::async, [=]\r
+               boost::thread([=]\r
                {\r
                        std::unique_ptr<std::shared_ptr<frame_consumer>> pointer_guard(consumer);\r
 \r
@@ -73,7 +73,7 @@ public:
                        pointer_guard.reset();\r
 \r
                        --counter;\r
-               }); \r
+               }).detach()\r
        }\r
        \r
        virtual bool send(const_frame frame) override                                                                                                   {return consumer_->send(std::move(frame));}\r
index 912ad22e69eb2342a37be27c2a8a19be33c02139..1348d7135b7bea3c75516ca1e75a6daeb5e956fb 100644 (file)
@@ -35,6 +35,8 @@
 #include <common/future.h>\r
 #include <common/memory.h>\r
 \r
+#include <boost/thread.hpp>\r
+\r
 namespace caspar { namespace core {\r
        \r
 std::vector<const producer_factory_t> g_factories;\r
@@ -96,7 +98,7 @@ public:
                CASPAR_VERIFY(counter < 32);\r
                \r
                auto producer = new spl::shared_ptr<frame_producer>(std::move(producer_));\r
-               async(launch::async, [=]\r
+               boost::thread([=]\r
                {\r
                        std::unique_ptr<spl::shared_ptr<frame_producer>> pointer_guard(producer);\r
                        auto str = (*producer)->print();\r
@@ -113,7 +115,7 @@ public:
                        CASPAR_LOG(info) << str << L" Destroyed.";\r
 \r
                        --counter;\r
-               }); \r
+               }).detach()\r
        }\r
        \r
        virtual draw_frame      receive(int flags) override                                                                                                                                                             {return producer_->receive(flags);}\r