From: Helge Norberg <helge.norberg@gmail.com>
Date: Tue, 15 Oct 2013 11:26:12 +0000 (+0200)
Subject: Changed name of newtek to newtek-ivga and occurrences of the word AirPlay to iVGA
X-Git-Tag: 2.0.6~31
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=60e4e25e5612b1331ea3ea967814b03ad427a8b9

Changed name of newtek to newtek-ivga and occurrences of the word AirPlay to iVGA
---

diff --git a/CHANGES.txt b/CHANGES.txt
index d3e05e7ba..97a17a69f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,9 +23,9 @@ Consumers
   o Replaced usage of SFML for <system-audio /> with PortAudio, because of
     problems with SFML since change to static linkage. Also PortAudio seems to
     give lower latency.
-  o Added support for NewTek AirPlay. Enables the use of the CasparCG Server
+  o Added support for NewTek iVGA. Enables the use of the CasparCG Server
     output as an input source in a NewTek TriCaster without requiring a video
-    card. <newtek /> element in config enables AirPlay on a channel.
+    card. <newtek-ivga /> element in config enables iVGA on a channel.
   o Decklink: Created custom decklink allocator for reducing memory footprint.
 
 Producers
diff --git a/modules/newtek/consumer/newtek_consumer.cpp b/modules/newtek/consumer/newtek_ivga_consumer.cpp
similarity index 86%
rename from modules/newtek/consumer/newtek_consumer.cpp
rename to modules/newtek/consumer/newtek_ivga_consumer.cpp
index fad2ef1f8..5eb1609b8 100644
--- a/modules/newtek/consumer/newtek_consumer.cpp
+++ b/modules/newtek/consumer/newtek_ivga_consumer.cpp
@@ -21,7 +21,7 @@
  
 #include "../StdAfx.h"
 
-#include "newtek_consumer.h"
+#include "newtek_ivga_consumer.h"
 
 #include <core/consumer/frame_consumer.h>
 #include <core/parameters/parameters.h>
@@ -37,7 +37,7 @@
 
 namespace caspar { namespace newtek { 
 			
-struct newtek_consumer : public core::frame_consumer
+struct newtek_ivga_consumer : public core::frame_consumer
 {
 	std::shared_ptr<void>	air_send_;
 	core::video_format_desc format_desc_;
@@ -46,13 +46,13 @@ struct newtek_consumer : public core::frame_consumer
 
 public:
 
-	newtek_consumer(core::channel_layout channel_layout)
+	newtek_ivga_consumer(core::channel_layout channel_layout)
 		: executor_(print())
 		, channel_layout_(channel_layout)
 	{
 	}
 	
-	~newtek_consumer()
+	~newtek_ivga_consumer()
 	{
 	}
 
@@ -129,13 +129,13 @@ public:
 		
 	virtual std::wstring print() const override
 	{
-		return L"newtek";
+		return L"newtek-ivga";
 	}
 
 	virtual boost::property_tree::wptree info() const override
 	{
 		boost::property_tree::wptree info;
-		info.add(L"type", L"newtek-consumer");
+		info.add(L"type", L"newtek-ivga-consumer");
 		return info;
 	}
 
@@ -155,26 +155,26 @@ public:
 	}
 };	
 
-safe_ptr<core::frame_consumer> create_consumer(const core::parameters& params)
+safe_ptr<core::frame_consumer> create_ivga_consumer(const core::parameters& params)
 {
-	if(params.size() < 1 || params[0] != L"NEWTEK")
+	if(params.size() < 1 || params[0] != L"NEWTEK_IVGA")
 		return core::frame_consumer::empty();
 		
 	const auto channel_layout = core::default_channel_layout_repository()
 		.get_by_name(
 			params.get(L"CHANNEL_LAYOUT", L"STEREO"));
 
-	return make_safe<newtek_consumer>(channel_layout);
+	return make_safe<newtek_ivga_consumer>(channel_layout);
 }
 
-safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::wptree& ptree) 
+safe_ptr<core::frame_consumer> create_ivga_consumer(const boost::property_tree::wptree& ptree) 
 {	
 	const auto channel_layout =
 		core::default_channel_layout_repository()
 			.get_by_name(
 				boost::to_upper_copy(ptree.get(L"channel-layout", L"STEREO")));
 
-	return make_safe<newtek_consumer>(channel_layout);
+	return make_safe<newtek_ivga_consumer>(channel_layout);
 }
 
 }}
\ No newline at end of file
diff --git a/modules/newtek/consumer/newtek_consumer.h b/modules/newtek/consumer/newtek_ivga_consumer.h
similarity index 84%
rename from modules/newtek/consumer/newtek_consumer.h
rename to modules/newtek/consumer/newtek_ivga_consumer.h
index a780fed9b..021bdb287 100644
--- a/modules/newtek/consumer/newtek_consumer.h
+++ b/modules/newtek/consumer/newtek_ivga_consumer.h
@@ -36,7 +36,7 @@ namespace core {
 	 
 namespace newtek {
 
-safe_ptr<core::frame_consumer> create_consumer(const core::parameters& params);
-safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::wptree& ptree);
+safe_ptr<core::frame_consumer> create_ivga_consumer(const core::parameters& params);
+safe_ptr<core::frame_consumer> create_ivga_consumer(const boost::property_tree::wptree& ptree);
 
 }}
\ No newline at end of file
diff --git a/modules/newtek/newtek.cpp b/modules/newtek/newtek.cpp
index f75c9d84e..0a63c5f3d 100644
--- a/modules/newtek/newtek.cpp
+++ b/modules/newtek/newtek.cpp
@@ -21,7 +21,7 @@
 
 #include "newtek.h"
 
-#include "consumer/newtek_consumer.h"
+#include "consumer/newtek_ivga_consumer.h"
 
 #include <core/parameters/parameters.h>
 #include <core/consumer/frame_consumer.h>
@@ -34,7 +34,7 @@ void init()
 	{
 		core::register_consumer_factory([](const core::parameters& params)
 		{
-			return newtek::create_consumer(params);
+			return newtek::create_ivga_consumer(params);
 		});
 	}
 	catch(...){}
diff --git a/modules/newtek/newtek.vcxproj b/modules/newtek/newtek.vcxproj
index 2cd42381a..7d859bb10 100644
--- a/modules/newtek/newtek.vcxproj
+++ b/modules/newtek/newtek.vcxproj
@@ -239,7 +239,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="newtek.h" />
-    <ClInclude Include="consumer\newtek_consumer.h" />
+    <ClInclude Include="consumer\newtek_ivga_consumer.h" />
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
@@ -249,7 +249,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="consumer\newtek_consumer.cpp">
+    <ClCompile Include="consumer\newtek_ivga_consumer.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>
diff --git a/modules/newtek/newtek.vcxproj.filters b/modules/newtek/newtek.vcxproj.filters
index c2830ab85..31bdb1131 100644
--- a/modules/newtek/newtek.vcxproj.filters
+++ b/modules/newtek/newtek.vcxproj.filters
@@ -2,21 +2,21 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="StdAfx.cpp" />
+    <ClCompile Include="consumer\newtek_ivga_consumer.cpp">
+      <Filter>source\consumer</Filter>
+    </ClCompile>
     <ClCompile Include="newtek.cpp">
       <Filter>source</Filter>
     </ClCompile>
-    <ClCompile Include="consumer\newtek_consumer.cpp">
-      <Filter>source\consumer</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="consumer\newtek_ivga_consumer.h">
+      <Filter>source\consumer</Filter>
+    </ClInclude>
     <ClInclude Include="newtek.h">
       <Filter>source</Filter>
     </ClInclude>
-    <ClInclude Include="consumer\newtek_consumer.h">
-      <Filter>source\consumer</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="source">
diff --git a/shell/casparcg.config b/shell/casparcg.config
index ffa960ae2..903ec8826 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -102,9 +102,9 @@
                 <auto-deinterlace>true [true|false]</auto-deinterlace>
                 <vsync>false [true|false]</vsync>
             </screen>
-            <newtek>
+            <newtek-ivga>
               <channel-layout>stereo [mono|stereo|dts|dolbye|dolbydigital|smpte|passthru]</channel-layout>
-            </newtek>
+            </newtek-ivga>
             <file>
                 <path></path>
                 <vcodec>libx264 [libx264|qtrle]</vcodec>
diff --git a/shell/server.cpp b/shell/server.cpp
index cb000c4ca..8dde528c7 100644
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -51,7 +51,7 @@
 
 #include <modules/portaudio/consumer/portaudio_consumer.h>
 #include <modules/bluefish/consumer/bluefish_consumer.h>
-#include <modules/newtek/consumer/newtek_consumer.h>
+#include <modules/newtek/consumer/newtek_ivga_consumer.h>
 #include <modules/decklink/consumer/decklink_consumer.h>
 #include <modules/decklink/consumer/blocking_decklink_consumer.h>
 #include <modules/ogl/consumer/ogl_consumer.h>
@@ -220,8 +220,8 @@ struct server::implementation : boost::noncopyable
 					on_consumer(bluefish::create_consumer(xml_consumer.second));					
 				else if (name == L"decklink")					
 					on_consumer(decklink::create_consumer(xml_consumer.second));				
-				else if (name == L"newtek")					
-					on_consumer(newtek::create_consumer(xml_consumer.second));			
+				else if (name == L"newtek-ivga")					
+					on_consumer(newtek::create_ivga_consumer(xml_consumer.second));			
 				else if (name == L"blocking-decklink")
 					on_consumer(decklink::create_blocking_consumer(xml_consumer.second));				
 				else if (name == L"file" || name == L"stream")