From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Thu, 3 Nov 2011 18:39:14 +0000 (+0000)
Subject: 2.0.2: ct-producer uses complete path.
X-Git-Tag: 2.0.0.2~10
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=c4647c09f2092df9a71635d5866da89dce3a4fef

2.0.2: ct-producer uses complete path.
       No template-host node found in config is no longer considered an error.


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

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index df6064712..d499559cd 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 Sep 21 23:31:49 2011
+/* at Mon Oct 31 09:47:48 2011
  */
 /* Compiler settings for interop\DeckLinkAPI.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 
diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index 86e24837f..3d4f6ea71 100644
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Wed Sep 21 23:31:49 2011
+/* at Mon Oct 31 09:47:48 2011
  */
 /* Compiler settings for interop\DeckLinkAPI.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 
diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index da983e751..f3dbadcaf 100644
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -129,11 +129,11 @@ safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_fac
 	std::wstring filename = env::media_folder() + L"\\" + params[0] + L".ct";
 	if(!boost::filesystem::exists(filename))
 		return core::frame_producer::empty();
-	
-	boost::algorithm::replace_all(filename, L"\\", L"/");
-	boost::algorithm::replace_all(filename, L"//", L"/");
-	boost::algorithm::replace_all(filename, L"///", L"/");
-	
+		
+	boost::filesystem2::wpath path(filename);
+	path = boost::filesystem2::complete(path);
+	filename = path.file_string();
+
 	auto flash_producer = flash::create_producer(frame_factory, boost::assign::list_of<std::wstring>());	
 	auto producer = make_safe<cg_producer>(flash_producer);
 	producer->add(0, filename, 1);
diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index a93e70f08..9ac975017 100644
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -95,28 +95,35 @@ struct template_host
 
 template_host get_template_host(const core::video_format_desc& desc)
 {
-	std::vector<template_host> template_hosts;
-	BOOST_FOREACH(auto& xml_mapping, env::properties().get_child("configuration.producers.template-hosts"))
+	try
 	{
-		try
+		std::vector<template_host> template_hosts;
+		BOOST_FOREACH(auto& xml_mapping, env::properties().get_child("configuration.producers.template-hosts"))
 		{
-			template_host template_host;
-			template_host.field_mode		= xml_mapping.second.get("video-mode", narrow(desc.name));
-			template_host.filename			= xml_mapping.second.get("filename", "cg.fth");
-			template_host.width				= xml_mapping.second.get("width", desc.width);
-			template_host.height			= xml_mapping.second.get("height", desc.height);
-			template_hosts.push_back(template_host);
+			try
+			{
+				template_host template_host;
+				template_host.field_mode		= xml_mapping.second.get("video-mode", narrow(desc.name));
+				template_host.filename			= xml_mapping.second.get("filename", "cg.fth");
+				template_host.width				= xml_mapping.second.get("width", desc.width);
+				template_host.height			= xml_mapping.second.get("height", desc.height);
+				template_hosts.push_back(template_host);
+			}
+			catch(...){}
 		}
-		catch(...){}
-	}
 
-	auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == narrow(desc.name);});
-	if(template_host_it == template_hosts.end())
-		template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == "";});
+		auto template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == narrow(desc.name);});
+		if(template_host_it == template_hosts.end())
+			template_host_it = boost::find_if(template_hosts, [&](template_host template_host){return template_host.field_mode == "";});
+
+		if(template_host_it != template_hosts.end())
+			return *template_host_it;
+	}
+	catch(...)
+	{
+		CASPAR_LOG(info) << L" Found no correct template-host configuration. Using cg.fth.";
+	}
 
-	if(template_host_it != template_hosts.end())
-		return *template_host_it;
-	
 	template_host template_host;
 	template_host.filename = "cg.fth";
 	template_host.width = desc.width;
diff --git a/shell/casparcg.config b/shell/casparcg.config
index fd68da33d..1e09cf3bc 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -9,39 +9,32 @@
   <diagnostics>
     <graphs>true</graphs>
   </diagnostics>
-  <consumers>
-    <buffer-depth>3</buffer-depth>
-  </consumers>
   <mixers>
     <blend-modes>false</blend-modes>
   </mixers>
   <producers>
-    <buffer-depth>1</buffer-depth>
     <auto-transcode>true</auto-transcode>
-    <template-hosts>
-      <template-host>
-        <video-mode>1080i5994</video-mode>
-        <filename>cg.fth.18.6000</filename>
-      </template-host>
-      <template-host>
-        <video-mode>1080p5000</video-mode>
-        <filename>cg.fth.18</filename>
-        <width>1280</width>
-        <height>720</height>
-      </template-host>
-    </template-hosts>
-    </producers>
-    <channels>
-      <channel>
-        <video-mode>1080p5000</video-mode>
-        <consumers>
-          <decklink>
-            <device>1</device>
-            <embedded-audio>true</embedded-audio>
-          </decklink>
-        </consumers>
-      </channel>
-    </channels>
+  </producers>
+  <channels>
+    <channel>
+      <video-mode>PAL</video-mode>
+      <consumers>
+        <bluefish>
+          <device>1</device>
+          <embedded-audio>true</embedded-audio>
+        </bluefish>
+      </consumers>
+    </channel>
+    <channel>
+      <video-mode>PAL</video-mode>
+      <consumers>
+        <screen>
+          <device>1</device>
+        </screen>
+        <system-audio/>
+      </consumers>
+    </channel>
+  </channels>
   <controllers>
     <tcp>
       <port>5250</port>
@@ -101,6 +94,6 @@
       </screen>
     </consumers>
 </channel>  
--->  
-  
+-->
+