git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 637f7b9a17e057001df1d7ad3df8f110f75a660c..b4a6844245b2cc317b9d5ca654bcfb8fecd60823 100644 (file)
--- 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());\r
                context_->SetActive(true);\r
                                                \r
-               if(!GLEE_VERSION_3_0)\r
-                       BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 3.0 support."));\r
-\r
                GL(glGenFramebuffers(1, &fbo_));                \r
                GL(glBindFramebuffer(GL_FRAMEBUFFER_EXT, fbo_));\r
                GL(glReadBuffer(GL_COLOR_ATTACHMENT0_EXT));\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index c0f2a1e2886d4af56d68a610d96c40169ebcdb39..04c9fc886e507d4bf14a8b4c61cf3b2524b2a71f 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -85,6 +85,12 @@ public:
                , layer_key_(false)\r
        {\r
                transform_stack_.push(core::image_transform());\r
+\r
+               channel_.ogl().invoke([=]\r
+               {\r
+                       if(!GLEE_VERSION_3_0)\r
+                               BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 3.0 support."));\r
+               });\r
        }\r
        \r
        void begin(const core::basic_frame& frame)\r

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index 385d65eb1a1042af322b8aa0a30a0fd423ee65d6..bb33eea1cec89312bef8ba5f65d3f94276bbb879 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Wed Jun 08 10:03:03 2011\r
+/* at Thu Jun 09 13:48:27 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/shell/casparcg.config b/shell/casparcg.config
new file mode 100644 (file)
index 0000000..41173f5
--- /dev/null
+++ b/shell/casparcg.config
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<configuration>\r
+  <paths>\r
+    <media-path>L:\\Casparcg\\_media\\</media-path>\r
+    <log-path>L:\\Casparcg\\_log\\</log-path>\r
+    <data-path>L:\\Casparcg\\_data\\</data-path>\r
+    <template-path>L:\\Casparcg\\_templates\\</template-path>\r
+    <template-host>cg.fth.18</template-host>\r
+  </paths>\r
+  <diagnostics>\r
+    <graphs>true</graphs>\r
+  </diagnostics>\r
+  <channels>\r
+    <channel>\r
+      <video-mode>1080i5000</video-mode>\r
+      <consumers>\r
+        <decklink>\r
+          <device>1</device>                    \r
+          <embedded-audio>true</embedded-audio> \r
+          <low-latency>true</low-latency>      \r
+          <external-key>true</external-key>     \r
+          <key-only>false</key-only>            \r
+        </decklink>\r
+      </consumers>\r
+    </channel>\r
+</channels>\r
+  <controllers>\r
+    <tcp>\r
+      <port>5250</port>\r
+      <protocol>AMCP</protocol>\r
+    </tcp>\r
+  </controllers>\r
+</configuration>\r
+\r
+<!--\r
+<channel>\r
+  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
+    <consumers>\r
+      <decklink>\r
+        <device>[1..]</device>\r
+        <embedded-audio>false [true|false]</embedded-audio>\r
+        <low-latency>false [true|false]</low-latency>\r
+        <external-key>true [true|false]</external-key>\r
+        <key-only>false [true|false]</key-only>\r
+      </decklink>\r
+      <bluefish>\r
+        <device>[1..]</device>\r
+        <embedded-audio>false [true|false]</embedded-audio>\r
+        <key-only>false [true|false]</key-only>\r
+      </bluefish>\r
+      <audio></audio>\r
+      <screen>\r
+        <device>[0..]</device>\r
+        <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>\r
+        <windowed>false [true|false]</windowed>\r
+        <key-only>false [true|false]</key-only>\r
+      </screen>\r
+    </consumers>\r
+</channel>  \r
+-->  \r
+  \r
+\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 4b78cf703ab10b2686526c0b163a74b974d2c33e..b99aa7e0721692f2ee69c0e78926952ab6e60991 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -162,7 +162,7 @@ int main(int argc, wchar_t* argv[])
        try \r
        {\r
                // Configure environment properties from configuration.\r
-               caspar::env::configure("caspar.config");\r
+               caspar::env::configure("casparcg.config");\r
 \r
        #ifdef _DEBUG\r
                if(caspar::env::properties().get("configuration.debugging.remote", false))\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 3f4ec5fae71e08616af44acd0808a46450f3a832..b719ca86700addc667cf5003f156faddd56dea14 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -60,7 +60,7 @@
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="caspar.config">\r
+    <None Include="casparcg.config">\r
       <SubType>Designer</SubType>\r
     </None>\r
     <None Include="CasparCG.ico" />\r
@@ -198,7 +198,7 @@
     </Link>\r
     <PostBuildEvent>\r
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>\r
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -253,7 +253,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </Link>\r
     <PostBuildEvent>\r
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>\r
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">\r
@@ -308,7 +308,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </Link>\r
     <PostBuildEvent>\r
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>\r
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">\r
@@ -363,7 +363,7 @@ copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>
     </Link>\r
     <PostBuildEvent>\r
       <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
-copy "$(ProjectDir)caspar.config" "$(OutDir)"</Command>\r
+copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r

diff --git a/shell/shell.vcxproj.filters b/shell/shell.vcxproj.filters
index 3e3f7f652b7f0dbd30c6238aa5d4e9329d6fddf6..c38757d0e4e3b04b547c64b286e3584bfb042bc7 100644 (file)
--- a/shell/shell.vcxproj.filters
+++ b/shell/shell.vcxproj.filters
@@ -5,8 +5,8 @@
     <ClCompile Include="server.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="caspar.config" />\r
     <None Include="CasparCG.ico" />\r
+    <None Include="casparcg.config" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="resource.h" />\r