From c1e94cb896b01bb9b3c74d578b294ecdb50091f9 Mon Sep 17 00:00:00 2001
From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Sat, 22 Jan 2011 22:46:13 +0000
Subject: [PATCH] 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
---
 core/core.vcxproj                      | 37 ++++++++++++++++++++++++
 core/core.vcxproj.filters              | 39 ++++++++++++++++++++++++++
 core/producer/flash/flash_producer.cpp |  6 +---
 protocol/media.cpp                     |  4 ++-
 shell/main.cpp                         |  6 ++++
 5 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 3e123a8a4..377e08681 100644
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -182,6 +182,11 @@
     <ClInclude Include="producer\image\image_scroll_producer.h" />
     <ClInclude Include="producer\layer.h" />
     <ClInclude Include="producer\screen\screen_producer.h" />
+    <ClInclude Include="producer\silverlight\silverlight_producer.h" />
+    <ClInclude Include="producer\silverlight\XcpControlHost.h" />
+    <ClInclude Include="producer\silverlight\xcpctrl.h" />
+    <ClInclude Include="producer\silverlight\xcpctrl_h.h" />
+    <ClInclude Include="producer\silverlight\XcpPropertyBag.h" />
     <ClInclude Include="producer\transition\transition_producer.h" />
     <ClInclude Include="video_format.h" />
     <CustomBuildStep Include="consumers\bluefish\BluefishException.h" />
@@ -288,6 +293,34 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
+    <ClCompile Include="producer\silverlight\silverlight_producer.cpp">
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\XcpControlHost.cpp">
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\xcpctrl_i.c">
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\xcpctrl_p.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\XcpPropertyBag.cpp">
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="producer\transition\transition_producer.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>
@@ -319,6 +352,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </Midl>
+    <Midl Include="producer\silverlight\xcpctrl.idl">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </Midl>
   </ItemGroup>
   <ItemGroup>
     <None Include="My Amplifier Results\r000hs\r000hs.ampl" />
diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index eed666a63..ca017582b 100644
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -67,6 +67,12 @@
     <Filter Include="Source\producer\screen">
       <UniqueIdentifier>{eefc7a28-4013-458d-a91f-c822749984e8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source\producer\silverlight">
+      <UniqueIdentifier>{72cb7c9e-3b8c-4a45-8ee5-26f3dd091928}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source\producer\silverlight\interop">
+      <UniqueIdentifier>{865b1b03-83c0-4c59-b896-f98cd3323c00}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="consumer\decklink\DeckLinkAPI_h.h">
@@ -168,6 +174,21 @@
     <ClInclude Include="producer\screen\screen_producer.h">
       <Filter>Source\producer\screen</Filter>
     </ClInclude>
+    <ClInclude Include="producer\silverlight\silverlight_producer.h">
+      <Filter>Source\producer\silverlight</Filter>
+    </ClInclude>
+    <ClInclude Include="producer\silverlight\XcpPropertyBag.h">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClInclude>
+    <ClInclude Include="producer\silverlight\XcpControlHost.h">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClInclude>
+    <ClInclude Include="producer\silverlight\xcpctrl.h">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClInclude>
+    <ClInclude Include="producer\silverlight\xcpctrl_h.h">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="consumer\decklink\DeckLinkAPI_i.c">
@@ -251,6 +272,21 @@
     <ClCompile Include="producer\screen\screen_producer.cpp">
       <Filter>Source\producer\screen</Filter>
     </ClCompile>
+    <ClCompile Include="producer\silverlight\silverlight_producer.cpp">
+      <Filter>Source\producer\silverlight</Filter>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\XcpControlHost.cpp">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\xcpctrl_i.c">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\xcpctrl_p.c">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClCompile>
+    <ClCompile Include="producer\silverlight\XcpPropertyBag.cpp">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="producer\flash\Flash9e.IDL">
@@ -268,6 +304,9 @@
     <Midl Include="consumer\decklink\DeckLinkAPI_v7_3.idl">
       <Filter>Source\consumer\decklink\interop</Filter>
     </Midl>
+    <Midl Include="producer\silverlight\xcpctrl.idl">
+      <Filter>Source\producer\silverlight\interop</Filter>
+    </Midl>
   </ItemGroup>
   <ItemGroup>
     <None Include="My Amplifier Results\r000hs\r000hs.ampl">
diff --git a/core/producer/flash/flash_producer.cpp b/core/producer/flash/flash_producer.cpp
index 4382ef12b..a09fe5564 100644
--- a/core/producer/flash/flash_producer.cpp
+++ b/core/producer/flash/flash_producer.cpp
@@ -39,11 +39,7 @@
 #include <boost/filesystem.hpp>
 
 namespace caspar { namespace core { namespace flash {
-
-// NOTE: This is needed in order to make CComObject work since this is not a real ATL project.
-CComModule _AtlModule;
-extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;
-
+	
 class flash_renderer
 {
 	struct co_init
diff --git a/protocol/media.cpp b/protocol/media.cpp
index 15fb0b9b5..359635b50 100644
--- a/protocol/media.cpp
+++ b/protocol/media.cpp
@@ -8,6 +8,7 @@
 #include <core/producer/image/image_producer.h>
 #include <core/producer/decklink/decklink_producer.h>
 #include <core/producer/screen/screen_producer.h>
+#include <core/producer/silverlight/silverlight_producer.h>
 
 #include <core/consumer/bluefish/bluefish_consumer.h>
 #include <core/consumer/decklink/decklink_consumer.h>
@@ -38,7 +39,8 @@ safe_ptr<core::frame_producer> create_producer(const std::vector<std::wstring>&
 		(&core::image::create_image_producer)
 		(&core::create_decklink_producer)
 		(&core::create_color_producer)
-		(&core::create_screen_producer);
+		(&core::create_screen_producer)
+		(&core::create_silverlight_producer);
 
 	if(params.empty())
 		BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));
diff --git a/shell/main.cpp b/shell/main.cpp
index 9cf50e9ad..2c36ce397 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -40,10 +40,16 @@
 #include <common/utility/assert.h>
 #include <protocol/amcp/AMCPProtocolStrategy.h>
 
+#include <atlbase.h>
+
 using namespace caspar;
 using namespace caspar::core;
 using namespace caspar::protocol;
 
+// NOTE: This is needed in order to make CComObject work since this is not a real ATL project.
+CComModule _AtlModule;
+extern __declspec(selectany) CAtlModule* _pAtlModule = &_AtlModule;
+
 class win32_handler_tbb_installer : public tbb::task_scheduler_observer
 {
 public:
-- 
2.39.2