2.0.0.2: Moved ATL init to shell.

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

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 3e123a8a46d4a68d54c354c7e09e52c42c63186f..377e0868172408284288236379005c71a66d9b54 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -182,6 +182,11 @@
     <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\silverlight\silverlight_producer.h" />\r
+    <ClInclude Include="producer\silverlight\XcpControlHost.h" />\r
+    <ClInclude Include="producer\silverlight\xcpctrl.h" />\r
+    <ClInclude Include="producer\silverlight\xcpctrl_h.h" />\r
+    <ClInclude Include="producer\silverlight\XcpPropertyBag.h" />\r
     <ClInclude Include="producer\transition\transition_producer.h" />\r
     <ClInclude Include="video_format.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishException.h" />\r
@@ -288,6 +293,34 @@
       <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\silverlight\silverlight_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\silverlight\XcpControlHost.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\xcpctrl_i.c">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\xcpctrl_p.c">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\XcpPropertyBag.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\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
@@ -319,6 +352,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
     </Midl>\r
+    <Midl Include="producer\silverlight\xcpctrl.idl">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+    </Midl>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="My Amplifier Results\r000hs\r000hs.ampl" />\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index eed666a6384def7b4905c32ed46c32d8d5129493..ca017582b5dcc75506048f6202d838a6ebe43c9b 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -67,6 +67,12 @@
     <Filter Include="Source\producer\screen">\r
       <UniqueIdentifier>{eefc7a28-4013-458d-a91f-c822749984e8}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Source\producer\silverlight">\r
+      <UniqueIdentifier>{72cb7c9e-3b8c-4a45-8ee5-26f3dd091928}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source\producer\silverlight\interop">\r
+      <UniqueIdentifier>{865b1b03-83c0-4c59-b896-f98cd3323c00}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\decklink\DeckLinkAPI_h.h">\r
@@ -168,6 +174,21 @@
     <ClInclude Include="producer\screen\screen_producer.h">\r
       <Filter>Source\producer\screen</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="producer\silverlight\silverlight_producer.h">\r
+      <Filter>Source\producer\silverlight</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="producer\silverlight\XcpPropertyBag.h">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="producer\silverlight\XcpControlHost.h">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="producer\silverlight\xcpctrl.h">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="producer\silverlight\xcpctrl_h.h">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="consumer\decklink\DeckLinkAPI_i.c">\r
@@ -251,6 +272,21 @@
     <ClCompile Include="producer\screen\screen_producer.cpp">\r
       <Filter>Source\producer\screen</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="producer\silverlight\silverlight_producer.cpp">\r
+      <Filter>Source\producer\silverlight</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\XcpControlHost.cpp">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\xcpctrl_i.c">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\xcpctrl_p.c">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\silverlight\XcpPropertyBag.cpp">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="producer\flash\Flash9e.IDL">\r
@@ -268,6 +304,9 @@
     <Midl Include="consumer\decklink\DeckLinkAPI_v7_3.idl">\r
       <Filter>Source\consumer\decklink\interop</Filter>\r
     </Midl>\r
+    <Midl Include="producer\silverlight\xcpctrl.idl">\r
+      <Filter>Source\producer\silverlight\interop</Filter>\r
+    </Midl>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="My Amplifier Results\r000hs\r000hs.ampl">\r

diff --git a/core/producer/flash/flash_producer.cpp b/core/producer/flash/flash_producer.cpp
index 4382ef12b41dd5d0f5c62ee7cb3d4880295a24ff..a09fe55645937115613721365980e7c029085cc3 100644 (file)
--- a/core/producer/flash/flash_producer.cpp
+++ b/core/producer/flash/flash_producer.cpp
@@ -39,11 +39,7 @@
 #include <boost/filesystem.hpp>\r
 \r
 namespace caspar { namespace core { namespace flash {\r
-\r
-// NOTE: This is needed in order to make CComObject work since this is not a real ATL project.\r
-CComModule _AtlModule;\r
-extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;\r
-\r
+       \r
 class flash_renderer\r
 {\r
        struct co_init\r

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

diff --git a/shell/main.cpp b/shell/main.cpp
index 9cf50e9ad171ab84a1ef24f2f442841b675eb7eb..2c36ce3975536e5f931527cba1ae305284006502 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -40,10 +40,16 @@
 #include <common/utility/assert.h>\r
 #include <protocol/amcp/AMCPProtocolStrategy.h>\r
 \r
+#include <atlbase.h>\r
+\r
 using namespace caspar;\r
 using namespace caspar::core;\r
 using namespace caspar::protocol;\r
 \r
+// NOTE: This is needed in order to make CComObject work since this is not a real ATL project.\r
+CComModule _AtlModule;\r
+extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;\r
+\r
 class win32_handler_tbb_installer : public tbb::task_scheduler_observer\r
 {\r
 public:\r