2.0.0.2: added screen_producer.

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

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 45bedb35fbca4dad2df0c023072a27c72688435f..3e123a8a46d4a68d54c354c7e09e52c42c63186f 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -181,6 +181,7 @@
     <ClInclude Include="producer\image\image_producer.h" />\r
     <ClInclude Include="producer\image\image_scroll_producer.h" />\r
     <ClInclude Include="producer\layer.h" />\r
+    <ClInclude Include="producer\screen\screen_producer.h" />\r
     <ClInclude Include="producer\transition\transition_producer.h" />\r
     <ClInclude Include="video_format.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishException.h" />\r
@@ -283,6 +284,10 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile>\r
     </ClCompile>\r
+    <ClCompile Include="producer\screen\screen_producer.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index bbf80f8ef95d1c0b21f38b23264fe66a2cc1b253..eed666a6384def7b4905c32ed46c32d8d5129493 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -64,6 +64,9 @@
     <Filter Include="Source\consumer\ffmpeg">\r
       <UniqueIdentifier>{b651856c-ff7e-4f90-be8a-32aba6094dbd}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Source\producer\screen">\r
+      <UniqueIdentifier>{eefc7a28-4013-458d-a91f-c822749984e8}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\decklink\DeckLinkAPI_h.h">\r
@@ -162,6 +165,9 @@
     <ClInclude Include="producer\layer.h">\r
       <Filter>Source\producer</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="producer\screen\screen_producer.h">\r
+      <Filter>Source\producer\screen</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="consumer\decklink\DeckLinkAPI_i.c">\r
@@ -242,6 +248,9 @@
     <ClCompile Include="producer\layer.cpp">\r
       <Filter>Source\producer</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="producer\screen\screen_producer.cpp">\r
+      <Filter>Source\producer\screen</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="producer\flash\Flash9e.IDL">\r

diff --git a/core/producer/frame_producer_device.cpp b/core/producer/frame_producer_device.cpp
index 9a9077a70e25af78b0fb1a7ca7aab656766825e1..5536a6f6233fb1cdfc423f98fadc284232cc5525 100644 (file)
--- a/core/producer/frame_producer_device.cpp
+++ b/core/producer/frame_producer_device.cpp
@@ -49,12 +49,13 @@ public:
                                        \r
        void tick()\r
        {               \r
+               auto frames = draw();\r
                output_func output;\r
                {\r
                        tbb::spin_mutex::scoped_lock lock(output_mutex_);\r
                        output = output_;\r
                }\r
-               output(draw());\r
+               output(frames);\r
                executor_.begin_invoke([=]{tick();});\r
        }\r
        \r

diff --git a/protocol/media.cpp b/protocol/media.cpp
index 6c8b015daf92c519bf113fc94afc379c3bbad89b..15fb0b9b54404d124afe4c4804edd55afdb3fd43 100644 (file)
--- a/protocol/media.cpp
+++ b/protocol/media.cpp
@@ -7,6 +7,7 @@
 #include <core/producer/flash/cg_producer.h>\r
 #include <core/producer/image/image_producer.h>\r
 #include <core/producer/decklink/decklink_producer.h>\r
+#include <core/producer/screen/screen_producer.h>\r
 \r
 #include <core/consumer/bluefish/bluefish_consumer.h>\r
 #include <core/consumer/decklink/decklink_consumer.h>\r
@@ -36,7 +37,8 @@ safe_ptr<core::frame_producer> create_producer(const std::vector<std::wstring>&
                (&core::ffmpeg::create_ffmpeg_producer)\r
                (&core::image::create_image_producer)\r
                (&core::create_decklink_producer)\r
-               (&core::create_color_producer);\r
+               (&core::create_color_producer)\r
+               (&core::create_screen_producer);\r
 \r
        if(params.empty())\r
                BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));\r