From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Thu, 9 Jun 2011 14:57:03 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~444
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2537e4e01e2ab2802dd4e571809064d78fbdbd27;p=casparcg

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

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 637f7b9a1..b4a684424 100644
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -35,9 +35,6 @@ ogl_device::ogl_device() : executor_(L"ogl_device")
 		context_.reset(new sf::Context());
 		context_->SetActive(true);
 						
-		if(!GLEE_VERSION_3_0)
-			BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 3.0 support."));
-
 		GL(glGenFramebuffers(1, &fbo_));		
 		GL(glBindFramebuffer(GL_FRAMEBUFFER_EXT, fbo_));
 		GL(glReadBuffer(GL_COLOR_ATTACHMENT0_EXT));
diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index c0f2a1e28..04c9fc886 100644
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -85,6 +85,12 @@ public:
 		, layer_key_(false)
 	{
 		transform_stack_.push(core::image_transform());
+
+		channel_.ogl().invoke([=]
+		{
+			if(!GLEE_VERSION_3_0)
+				BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 3.0 support."));
+		});
 	}
 	
 	void begin(const core::basic_frame& frame)
diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index 385d65eb1..bb33eea1c 100644
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Wed Jun 08 10:03:03 2011
+/* at Thu Jun 09 13:48:27 2011
  */
 /* Compiler settings for interop\DeckLinkAPI.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 
diff --git a/shell/casparcg.config b/shell/casparcg.config
new file mode 100644
index 000000000..41173f595
--- /dev/null
+++ b/shell/casparcg.config
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <paths>
+    <media-path>L:\\Casparcg\\_media\\</media-path>
+    <log-path>L:\\Casparcg\\_log\\</log-path>
+    <data-path>L:\\Casparcg\\_data\\</data-path>
+    <template-path>L:\\Casparcg\\_templates\\</template-path>
+    <template-host>cg.fth.18</template-host>
+  </paths>
+  <diagnostics>
+    <graphs>true</graphs>
+  </diagnostics>
+  <channels>
+    <channel>
+      <video-mode>1080i5000</video-mode>
+      <consumers>
+        <decklink>
+          <device>1</device>                    
+          <embedded-audio>true</embedded-audio> 
+          <low-latency>true</low-latency>      
+          <external-key>true</external-key>     
+          <key-only>false</key-only>            
+        </decklink>
+      </consumers>
+    </channel>
+</channels>
+  <controllers>
+    <tcp>
+      <port>5250</port>
+      <protocol>AMCP</protocol>
+    </tcp>
+  </controllers>
+</configuration>
+
+<!--
+<channel>
+  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>
+    <consumers>
+      <decklink>
+        <device>[1..]</device>
+        <embedded-audio>false [true|false]</embedded-audio>
+        <low-latency>false [true|false]</low-latency>
+        <external-key>true [true|false]</external-key>
+        <key-only>false [true|false]</key-only>
+      </decklink>
+      <bluefish>
+        <device>[1..]</device>
+        <embedded-audio>false [true|false]</embedded-audio>
+        <key-only>false [true|false]</key-only>
+      </bluefish>
+      <audio></audio>
+      <screen>
+        <device>[0..]</device>
+        <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>
+        <windowed>false [true|false]</windowed>
+        <key-only>false [true|false]</key-only>
+      </screen>
+    </consumers>
+</channel>  
+-->  
+  
+
diff --git a/shell/main.cpp b/shell/main.cpp
index 4b78cf703..b99aa7e07 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -162,7 +162,7 @@ int main(int argc, wchar_t* argv[])
 	try 
 	{
 		// Configure environment properties from configuration.
-		caspar::env::configure("caspar.config");
+		caspar::env::configure("casparcg.config");
 
 	#ifdef _DEBUG
 		if(caspar::env::properties().get("configuration.debugging.remote", false))
diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 3f4ec5fae..b719ca867 100644
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -60,7 +60,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="caspar.config">
+    <None Include="casparcg.config">
       <SubType>Designer</SubType>
     </None>
     <None Include="CasparCG.ico" />
@@ -198,7 +198,7 @@
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -253,7 +253,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
@@ -308,7 +308,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">
@@ -363,7 +363,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/shell/shell.vcxproj.filters b/shell/shell.vcxproj.filters
index 3e3f7f652..c38757d0e 100644
--- a/shell/shell.vcxproj.filters
+++ b/shell/shell.vcxproj.filters
@@ -5,8 +5,8 @@
     <ClCompile Include="server.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="caspar.config" />
     <None Include="CasparCG.ico" />
+    <None Include="casparcg.config" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />