git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 1ef79f3d33d872e2ee217a92f3b6dc3f85280c3c..2e1425a47c3607fa0b91fb9eb302cf2b1aee3d13 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -39,15 +39,10 @@ namespace caspar { namespace core {
                \r
 void destroy_producer(safe_ptr<frame_producer>& producer)\r
 {\r
-       bool unique = producer.unique();\r
-\r
-       if(!unique)\r
-               CASPAR_LOG(warning) << producer->print() << L" Not destroyed on safe asynchronous destruction thread.";\r
+       if(!producer.unique())\r
+               CASPAR_LOG(debug) << producer->print() << L" Not destroyed on safe asynchronous destruction thread.";\r
        \r
        producer = frame_producer::empty();\r
-               \r
-       if(unique)\r
-               CASPAR_LOG(debug) << producer->print() << L" Destroyed.";\r
 }\r
 \r
 class destroy_producer_proxy : public frame_producer\r
@@ -79,8 +74,6 @@ public:
 struct stage::implementation : boost::noncopyable\r
 {              \r
        std::map<int, layer>                                            layers_;                \r
-       typedef std::map<int, layer>::value_type        layer_t;\r
-               \r
        video_channel_context&                                          channel_;\r
 public:\r
        implementation(video_channel_context& video_channel)  \r
@@ -94,9 +87,6 @@ public:
 \r
                try\r
                {\r
-                       auto layers2 = std::move(layers_);\r
-                       std::remove_copy_if(layers2.begin(), layers2.end(), std::inserter(layers_, layers_.begin()), [](layer_t& layer){return layer.second.empty();});\r
-\r
                        BOOST_FOREACH(auto& layer, layers_)\r
                                frames[layer.first] = layer.second.receive();\r
                }\r