2.0. shell: Fixed icon.

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

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 9debd7fd36551ca304b718d44c99018ee009caf4..6ef4d33071c6f9f8f4795f93749ed6da877f9eba 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -41,21 +41,6 @@ struct render_item
        video_mode::type                                                mode;\r
        const void*                                                             tag;\r
        blend_mode::type                                                blend_mode;\r
-       \r
-       render_item(const pixel_format_desc& pix_desc, const std::vector<safe_ptr<device_buffer>>& textures, const image_transform& transform, video_mode::type mode, const void* tag, blend_mode::type blend_mode)\r
-               : pix_desc(pix_desc)\r
-               , textures(textures)\r
-               , transform(transform)\r
-               , mode(mode)\r
-               , tag(tag)\r
-               , blend_mode(blend_mode){}\r
-       render_item(render_item&& other)\r
-               : pix_desc(other.pix_desc)\r
-               , textures(std::move(other.textures))\r
-               , transform(other.transform)\r
-               , mode(other.mode)\r
-               , tag(other.tag)\r
-               , blend_mode(blend_mode){}\r
 };\r
 \r
 bool operator==(const render_item& lhs, const render_item& rhs);\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index edf38213358bf778182108df2786b70fb24c1000..cc4da64ba883b44a99f50b34093a822d9b442b50 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -57,8 +57,8 @@ struct image_mixer::implementation : boost::noncopyable
        video_channel_context&                                  channel_;\r
 \r
        std::vector<image_transform>                    transform_stack_;\r
-       std::vector<video_mode::type>                   mode_stack_;\r
-       std::stack<blend_mode::type>                    blend_stack_;\r
+       std::vector<video_mode::type>                   video_mode_stack_;\r
+       std::stack<blend_mode::type>                    blend_mode_stack_;\r
 \r
        std::deque<std::deque<render_item>>             layers_; // layer/stream/items\r
        \r
@@ -69,7 +69,7 @@ public:
        implementation(video_channel_context& video_channel) \r
                : channel_(video_channel)\r
                , transform_stack_(1)\r
-               , mode_stack_(1, video_mode::progressive)\r
+               , video_mode_stack_(1, video_mode::progressive)\r
        {\r
        }\r
 \r
@@ -81,7 +81,7 @@ public:
        void begin(core::basic_frame& frame)\r
        {\r
                transform_stack_.push_back(transform_stack_.back()*frame.get_image_transform());\r
-               mode_stack_.push_back(frame.get_mode() == video_mode::progressive ? mode_stack_.back() : frame.get_mode());\r
+               video_mode_stack_.push_back(frame.get_mode() == video_mode::progressive ? video_mode_stack_.back() : frame.get_mode());\r
        }\r
                \r
        void visit(core::write_frame& frame)\r
@@ -89,13 +89,18 @@ public:
                CASPAR_ASSERT(!layers_.empty());\r
 \r
                // Check if frame has been discarded by interlacing\r
-               if(boost::range::find(mode_stack_, video_mode::upper) != mode_stack_.end() && boost::range::find(mode_stack_, video_mode::lower) != mode_stack_.end())\r
+               if(boost::range::find(video_mode_stack_, video_mode::upper) != video_mode_stack_.end() && boost::range::find(video_mode_stack_, video_mode::lower) != video_mode_stack_.end())\r
                        return;\r
                \r
-               core::render_item item(frame.get_pixel_format_desc(), frame.get_textures(), transform_stack_.back(), mode_stack_.back(), frame.tag(), blend_stack_.top());      \r
+               core::render_item item;\r
+               item.pix_desc           = frame.get_pixel_format_desc();\r
+               item.textures           = frame.get_textures();\r
+               item.transform          = transform_stack_.back();\r
+               item.mode                       = video_mode_stack_.back();\r
+               item.tag                        = frame.tag();\r
+               item.blend_mode         = blend_mode_stack_.top();      \r
 \r
                auto& layer = layers_.back();\r
-\r
                if(boost::range::find(layer, item) == layer.end())\r
                        layer.push_back(item);\r
        }\r
@@ -103,18 +108,18 @@ public:
        void end()\r
        {\r
                transform_stack_.pop_back();\r
-               mode_stack_.pop_back();\r
+               video_mode_stack_.pop_back();\r
        }\r
 \r
        void begin_layer(blend_mode::type blend_mode)\r
        {\r
-               blend_stack_.push(blend_mode);\r
+               blend_mode_stack_.push(blend_mode);\r
                layers_.push_back(layer());\r
        }\r
 \r
        void end_layer()\r
        {\r
-               blend_stack_.pop();\r
+               blend_mode_stack_.pop();\r
        }\r
        \r
        boost::unique_future<safe_ptr<host_buffer>> render()\r
@@ -158,7 +163,6 @@ public:
                if(has_overlapping_items(layer, layer.front().blend_mode))\r
                {\r
                        auto local_draw_buffer = create_device_buffer(4);       \r
-\r
                        auto local_blend_mode = layer.front().blend_mode;\r
 \r
                        int fields = 0;\r
@@ -174,8 +178,14 @@ public:
 \r
                                draw_item(std::move(item), local_draw_buffer, local_key_buffer, layer_key_buffer);              \r
                        }\r
+                       \r
+                       render_item item;\r
+                       item.pix_desc.pix_fmt = pixel_format::bgra;\r
+                       item.pix_desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
+                       item.textures.push_back(local_draw_buffer);\r
+                       item.blend_mode = local_blend_mode;\r
 \r
-                       kernel_.draw(channel_.ogl(), create_render_item(local_draw_buffer, local_blend_mode), draw_buffer, nullptr, nullptr);\r
+                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, nullptr, nullptr);\r
                }\r
                else // fast path\r
                {\r
@@ -201,15 +211,15 @@ public:
                                local_key_buffer.second = create_device_buffer(1);\r
                        }\r
                        \r
-                       local_key_buffer.first |= item.mode;\r
+                       local_key_buffer.first |= item.mode; // Add field to flag.\r
                        kernel_.draw(channel_.ogl(), std::move(item), make_safe(local_key_buffer.second), nullptr, nullptr);\r
                }\r
                else\r
                {\r
                        kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer.second, layer_key_buffer);\r
-                       local_key_buffer.first ^= item.mode;\r
+                       local_key_buffer.first ^= item.mode; // Remove field from flag.\r
                        \r
-                       if(local_key_buffer.first == 0)\r
+                       if(local_key_buffer.first == 0) // If all fields from key has been used, reset it\r
                        {\r
                                local_key_buffer.first = 0;\r
                                local_key_buffer.second.reset();\r
@@ -251,20 +261,6 @@ public:
                //});\r
        }                       \r
                \r
-       render_item create_render_item(const safe_ptr<device_buffer>& buffer, blend_mode::type blend_mode)\r
-       {\r
-               CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
-\r
-               pixel_format_desc desc;\r
-               desc.pix_fmt = pixel_format::bgra;\r
-               desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
-\r
-               std::vector<safe_ptr<device_buffer>> textures;\r
-               textures.push_back(buffer);\r
-                               \r
-               return render_item(desc, std::move(textures), image_transform(), video_mode::progressive, nullptr, blend_mode);          \r
-       }\r
-\r
        safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r
                auto buffer = channel_.ogl().create_device_buffer(channel_.get_format_desc().width, channel_.get_format_desc().height, stride);\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 03d70ddbdad499b3bbc1bf2337aaa8bdfe9e424d..244b58fdb95d265b924cb4a8ca5ef5d47f1adc10 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -70,6 +70,9 @@
     <ClInclude Include="server.h" />\r
     <ClInclude Include="resource.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="shell.rc" />\r
+  </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{8C26C94F-8092-4769-8D84-DEA479721C5B}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r

diff --git a/shell/shell.vcxproj.filters b/shell/shell.vcxproj.filters
index 8f6e62cc355c3a4c02c2aee910ff3e1e6793b89a..9208de209c6ee3e73b66d040029d07beb555b078 100644 (file)
--- a/shell/shell.vcxproj.filters
+++ b/shell/shell.vcxproj.filters
@@ -25,4 +25,9 @@
       <UniqueIdentifier>{39e46848-dfec-441d-b0c0-f131380cdc6e}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="shell.rc">\r
+      <Filter>source</Filter>\r
+    </ResourceCompile>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file