2.0.0.2: Cleanup and commenting.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@838 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/producer/frame_producer_device.cpp b/core/producer/frame_producer_device.cpp
index 4d351ce19d6a2c400576fed5bffe57b4e1c5bc9c..30edde024fdfe4d17431967a529fa4c9b7e13c82 100644 (file)
--- a/core/producer/frame_producer_device.cpp
+++ b/core/producer/frame_producer_device.cpp
@@ -33,6 +33,7 @@
 #include <common/concurrency/executor.h>\r
 \r
 #include <boost/timer.hpp>\r
+#include <boost/range/algorithm.hpp>\r
 \r
 #include <tbb/parallel_for.h>\r
 \r
@@ -100,10 +101,8 @@ public:
                std::map<int, safe_ptr<basic_frame>> frames;\r
 \r
                // Allocate placeholders.\r
-               std::for_each(layers_.begin(), layers_.end(), [&](layer_t& layer)\r
-               {\r
+               BOOST_FOREACH(auto layer, layers_)\r
                        frames[layer.first] = basic_frame::empty();\r
-               });\r
 \r
                // Render layers\r
                tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](layer_t& layer)\r
@@ -187,10 +186,8 @@ public:
                        std::transform(layers_.begin(), layers_.end(), inserter, sel_first);\r
                        std::transform(other.impl_->layers_.begin(), other.impl_->layers_.end(), inserter, sel_first);\r
 \r
-                       std::for_each(indices.begin(), indices.end(), [&](int index)\r
-                       {\r
+                       BOOST_FOREACH(auto index, indices)\r
                                layers_[index].swap(other.impl_->layers_[index]);\r
-                       });                                     \r
                };\r
                \r
                channel_.execution.invoke([&]{other.impl_->channel_.execution.invoke(func);});\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 18b0362c56163069764b81777deab57e3893ee6a..09e5f6c9173d57dd800853d15c117f7f538136a2 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -46,9 +46,8 @@ public:
        {               \r
                background_ = producer;\r
 \r
-               if(preview) \r
-               {\r
-                       // Play the first frame and pause.\r
+               if(preview) // Play the first frame and pause.\r
+               {                       \r
                        play();\r
                        receive();\r
                        pause();\r
@@ -68,7 +67,6 @@ public:
        \r
        void stop()\r
        {\r
-               pause();\r
                foreground_ = frame_producer::empty();\r
        }\r
                \r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 8b59f2a30e636a039fb97d3cd34fa67cace23e5a..3cccf40f628cb5f681500ec390130dfa7181cf88 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -74,7 +74,7 @@ struct separated_producer : public frame_producer
 \r
        virtual std::wstring print() const\r
        {\r
-               return L"separed";\r
+               return L"separated";\r
        }       \r
 };\r
 \r