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

diff --git a/CHANGES.txt b/CHANGES.txt
index d3e05e7ba2a96c5c1eb7a8725d6355bb559128e3..97a17a69f92b11aa19f6019bc6e312f0eb5e4de2 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,9 +23,9 @@ Consumers
   o Replaced usage of SFML for <system-audio /> with PortAudio, because of\r
     problems with SFML since change to static linkage. Also PortAudio seems to\r
     give lower latency.\r
-  o Added support for NewTek AirPlay. Enables the use of the CasparCG Server\r
+  o Added support for NewTek iVGA. Enables the use of the CasparCG Server\r
     output as an input source in a NewTek TriCaster without requiring a video\r
-    card. <newtek /> element in config enables AirPlay on a channel.\r
+    card. <newtek-ivga /> element in config enables iVGA on a channel.\r
   o Decklink: Created custom decklink allocator for reducing memory footprint.\r
 \r
 Producers\r

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 fad2ef1f8c024e602e2485594181d0e5918d26f7..5eb1609b8f627f9ef8bc20686abaac1a58c1d1e1 100644 (file)
--- 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 a780fed9b367c1d5150cc13c9847c5b28e285ab3..021bdb28735bf1ab694db8d3a6442971f4fec2d9 100644 (file)
--- 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 f75c9d84e75d8b42ecc787944b7141d973a82fb3..0a63c5f3d012659c6f8303f5080cb8323a9a8f93 100644 (file)
--- 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 2cd42381ad6035b4ec3e13dcb6b8d30a620d4417..7d859bb104e3ee41337d00a52ad0cb67d852d10a 100644 (file)
--- 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 c2830ab854cd95116a4df72230855b5509684f74..31bdb1131e57f0968d8aa4ef30d51fb3ea027cf1 100644 (file)
--- 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 ffa960ae22149341354f9a1e0ad3c919d522bff0..903ec882641d6a971a788ee8a36c14361aadd47e 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -102,9 +102,9 @@
                 <auto-deinterlace>true [true|false]</auto-deinterlace>\r
                 <vsync>false [true|false]</vsync>\r
             </screen>\r
-            <newtek>\r
+            <newtek-ivga>\r
               <channel-layout>stereo [mono|stereo|dts|dolbye|dolbydigital|smpte|passthru]</channel-layout>\r
-            </newtek>\r
+            </newtek-ivga>\r
             <file>\r
                 <path></path>\r
                 <vcodec>libx264 [libx264|qtrle]</vcodec>\r

diff --git a/shell/server.cpp b/shell/server.cpp
index cb000c4caa629154bd5a5900728064ae5db0e245..8dde528c742ec2ce931f9016737fe14c9476d562 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -51,7 +51,7 @@
 \r
 #include <modules/portaudio/consumer/portaudio_consumer.h>\r
 #include <modules/bluefish/consumer/bluefish_consumer.h>\r
-#include <modules/newtek/consumer/newtek_consumer.h>\r
+#include <modules/newtek/consumer/newtek_ivga_consumer.h>\r
 #include <modules/decklink/consumer/decklink_consumer.h>\r
 #include <modules/decklink/consumer/blocking_decklink_consumer.h>\r
 #include <modules/ogl/consumer/ogl_consumer.h>\r
@@ -220,8 +220,8 @@ struct server::implementation : boost::noncopyable
                                        on_consumer(bluefish::create_consumer(xml_consumer.second));                                    \r
                                else if (name == L"decklink")                                   \r
                                        on_consumer(decklink::create_consumer(xml_consumer.second));                            \r
-                               else if (name == L"newtek")                                     \r
-                                       on_consumer(newtek::create_consumer(xml_consumer.second));                      \r
+                               else if (name == L"newtek-ivga")                                        \r
+                                       on_consumer(newtek::create_ivga_consumer(xml_consumer.second));                 \r
                                else if (name == L"blocking-decklink")\r
                                        on_consumer(decklink::create_blocking_consumer(xml_consumer.second));                           \r
                                else if (name == L"file" || name == L"stream")                                  \r