Refactored to use non-static data member initializers where it makes sense. Mixes...

[casparcg] / accelerator / ogl / image / image_mixer.cpp

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index 48505198fff012c3fbd2df1c22c86913a7251ddd..fa9a900ef375b8073fc6c8aaa77f85ca8e2e3ff8 100644 (file)
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -42,30 +42,22 @@
 
 #include <gl/glew.h>
 
-#include <boost/foreach.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/thread/future.hpp>
 
 #include <algorithm>
 #include <vector>
 
-using namespace boost::assign;
-
 namespace caspar { namespace accelerator { namespace ogl {
                
 typedef std::shared_future<std::shared_ptr<texture>> future_texture;
 
 struct item
 {
-       core::pixel_format_desc                                                         pix_desc;
-       std::vector<future_texture>                                                     textures;
-       core::image_transform                                                           transform;
-       core::frame_geometry                                                            geometry;
-
-       item()
-               : pix_desc(core::pixel_format::invalid)
-       {
-       }
+       core::pixel_format_desc         pix_desc        = core::pixel_format::invalid;
+       std::vector<future_texture>     textures;
+       core::image_transform           transform;
+       core::frame_geometry            geometry;
 };
 
 struct layer
@@ -106,7 +98,7 @@ public:
 
                if(format_desc.field_mode != core::field_mode::progressive)
                { // Remove jitter from still.
-                       BOOST_FOREACH(auto& layer, layers)
+                       for (auto& layer : layers)
                        {       
                                // Remove first field stills.
                                boost::range::remove_erase_if(layer.items, [&](const item& item)
@@ -115,7 +107,7 @@ public:
                                });
                
                                // Stills are progressive
-                               BOOST_FOREACH(auto& item, layer.items)
+                               for (auto& item : layer.items)
                                {
                                        if(item.transform.is_still)
                                                item.transform.field_mode = core::field_mode::progressive;
@@ -148,7 +140,7 @@ private:
        {
                std::shared_ptr<texture> layer_key_texture;
 
-               BOOST_FOREACH(auto& layer, layers)
+               for (auto& layer : layers)
                        draw(target_texture, std::move(layer), layer_key_texture, format_desc, field_mode);
        }
 
@@ -180,7 +172,7 @@ private:
                //}
 
                // Mask out fields
-               BOOST_FOREACH(auto& item, layer.items)                          
+               for (auto& item : layer.items)                          
                        item.transform.field_mode &= field_mode;
                
                // Remove empty items.
@@ -199,7 +191,7 @@ private:
                {
                        auto layer_texture = ogl_->create_texture(target_texture->width(), target_texture->height(), 4);
 
-                       BOOST_FOREACH(auto& item, layer.items)
+                       for (auto& item : layer.items)
                                draw(layer_texture, std::move(item), layer_key_texture, local_key_texture, local_mix_texture);  
                
                        draw(layer_texture, std::move(local_mix_texture), core::blend_mode::normal);                                                    
@@ -207,7 +199,7 @@ private:
                }
                else // fast path
                {
-                       BOOST_FOREACH(auto& item, layer.items)          
+                       for (auto& item : layer.items)          
                                draw(target_texture, std::move(item), layer_key_texture, local_key_texture, local_mix_texture);         
                                        
                        draw(target_texture, std::move(local_mix_texture), core::blend_mode::normal);
@@ -227,7 +219,7 @@ private:
                draw_params.transform   = std::move(item.transform);
                draw_params.geometry    = item.geometry;
 
-               BOOST_FOREACH(auto& future_texture, item.textures)
+               for (auto& future_texture : item.textures)
                        draw_params.textures.push_back(spl::make_shared_ptr(future_texture.get()));
 
                if(item.transform.is_key)
@@ -273,8 +265,8 @@ private:
 
                draw_params draw_params;
                draw_params.pix_desc.format             = core::pixel_format::bgra;
-               draw_params.pix_desc.planes             = list_of(core::pixel_format_desc::plane(source_buffer->width(), source_buffer->height(), 4));
-               draw_params.textures                    = list_of(source_buffer);
+               draw_params.pix_desc.planes             = { core::pixel_format_desc::plane(source_buffer->width(), source_buffer->height(), 4) };
+               draw_params.textures                    = { spl::make_shared_ptr(source_buffer) };
                draw_params.transform                   = core::image_transform();
                draw_params.blend_mode                  = blend_mode;
                draw_params.background                  = target_texture;
@@ -349,7 +341,7 @@ public:
        core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc) override
        {
                std::vector<array<std::uint8_t>> buffers;
-               BOOST_FOREACH(auto& plane, desc.planes)         
+               for (auto& plane : desc.planes)         
                        buffers.push_back(ogl_->create_array(plane.size));              
 
                return core::mutable_frame(std::move(buffers), core::audio_buffer(), tag, desc);