osc: Renamed "server" to "client".

diff --git a/protocol/osc/server.cpp b/protocol/osc/client.cpp
similarity index 94%
rename from protocol/osc/server.cpp
rename to protocol/osc/client.cpp
index b444abe6120c6dacebf4e8981d29149b500b9564..621bf369fea82a87ae64ae6902c877e3036618e3 100644 (file)
--- a/protocol/osc/server.cpp
+++ b/protocol/osc/client.cpp
@@ -1,6 +1,6 @@
 #include "..\stdafx.h"
 
-#include "server.h"
+#include "client.h"
 
 #include "oscpack/oscOutboundPacketStream.h"
 
@@ -55,7 +55,7 @@ std::vector<char> write_osc_event(const core::monitor::message& e)
        return std::vector<char>(o.Data(), o.Data() + o.Size());
 }
 
-struct server::impl
+struct client::impl
 {
        boost::asio::io_service                                         service_;
 
@@ -98,24 +98,24 @@ public:
        }
 };
 
-server::server(udp::endpoint endpoint, 
+client::client(udp::endpoint endpoint, 
                           Concurrency::ISource<core::monitor::message>& source) 
        : impl_(new impl(endpoint, source))
 {
 }
 
-server::server(server&& other)
+client::client(client&& other)
        : impl_(std::move(other.impl_))
 {
 }
 
-server& server::operator=(server&& other)
+client& client::operator=(client&& other)
 {
        impl_ = std::move(other.impl_);
        return *this;
 }
 
-server::~server()
+client::~client()
 {
 }
 

diff --git a/protocol/osc/server.h b/protocol/osc/client.h
similarity index 67%
rename from protocol/osc/server.h
rename to protocol/osc/client.h
index 1ca4f30cfa181b6b176969ed93b0a8c4820591d7..86af3f6e5dc27fdc6db2790645184d3326903731 100644 (file)
--- a/protocol/osc/server.h
+++ b/protocol/osc/client.h
@@ -7,26 +7,26 @@
 
 namespace caspar { namespace protocol { namespace osc {
 
-class server
+class client
 {
-       server(const server&);
-       server& operator=(const server&);
+       client(const client&);
+       client& operator=(const client&);
 public:        
 
        // Static Members
 
        // Constructors
 
-       server(boost::asio::ip::udp::endpoint endpoint, 
+       client(boost::asio::ip::udp::endpoint endpoint, 
                   Concurrency::ISource<core::monitor::message>& source);
        
-       server(server&&);
+       client(client&&);
 
-       ~server();
+       ~client();
 
        // Methods
                
-       server& operator=(server&&);
+       client& operator=(client&&);
        
        // Properties
 

diff --git a/protocol/protocol.vcxproj b/protocol/protocol.vcxproj
index ea2043b97f4d5f20193db85d88443d33a2dabc4b..0e87218c2478f8ef269f1304082486e4c7123597 100644 (file)
--- a/protocol/protocol.vcxproj
+++ b/protocol/protocol.vcxproj
@@ -51,7 +51,7 @@
     <ClInclude Include="osc\oscpack\OscPrintReceivedElements.h" />\r
     <ClInclude Include="osc\oscpack\OscReceivedElements.h" />\r
     <ClInclude Include="osc\oscpack\OscTypes.h" />\r
-    <ClInclude Include="osc\server.h" />\r
+    <ClInclude Include="osc\client.h" />\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="util\AsyncEventServer.h" />\r
     <ClInclude Include="util\ClientInfo.h" />\r
@@ -133,7 +133,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
-    <ClCompile Include="osc\server.cpp">\r
+    <ClCompile Include="osc\client.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/protocol/protocol.vcxproj.filters b/protocol/protocol.vcxproj.filters
index 9481cb9152c7d4437ddf590be6317052a6dd4c15..f786d17a6e2fc2f6fb103251c5e050fa1c8b5930 100644 (file)
--- a/protocol/protocol.vcxproj.filters
+++ b/protocol/protocol.vcxproj.filters
@@ -97,7 +97,7 @@
     <ClInclude Include="osc\oscpack\OscOutboundPacketStream.h">\r
       <Filter>source\osc\oscpack</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="osc\server.h">\r
+    <ClInclude Include="osc\client.h">\r
       <Filter>source\osc</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
@@ -151,7 +151,7 @@
     <ClCompile Include="osc\oscpack\OscOutboundPacketStream.cpp">\r
       <Filter>source\osc\oscpack</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="osc\server.cpp">\r
+    <ClCompile Include="osc\client.cpp">\r
       <Filter>source\osc</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 294e4d9ac581fb5e67f101bab6b3a27128acc9ea..24103332a8e7b6c2705ffff92d20bfa7a528c710 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -46,7 +46,7 @@
 #include <atlbase.h>\r
 \r
 #include <protocol/amcp/AMCPProtocolStrategy.h>\r
-#include <protocol/osc/server.h>\r
+#include <protocol/osc/client.h>\r
 \r
 #include <modules/bluefish/bluefish.h>\r
 #include <modules/decklink/decklink.h>\r

diff --git a/shell/server.cpp b/shell/server.cpp
index d9335a6ad10bf0f15863235fd7761bad60835c77..08896e277e1b9c67e052600bcf4dea6c3908077a 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -56,7 +56,7 @@
 #include <protocol/CLK/CLKProtocolStrategy.h>\r
 #include <protocol/util/AsyncEventServer.h>\r
 #include <protocol/util/stateful_protocol_strategy_wrapper.h>\r
-#include <protocol/osc/server.h>\r
+#include <protocol/osc/client.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
 #include <boost/lexical_cast.hpp>\r
@@ -75,7 +75,7 @@ struct server::implementation : boost::noncopyable
        boost::promise<bool>&                                           shutdown_server_now_;\r
        safe_ptr<ogl_device>                                            ogl_;\r
        std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_;     \r
-       std::vector<osc::server>                                        osc_servers_;\r
+       std::vector<osc::client>                                        osc_client_;\r
        std::vector<safe_ptr<video_channel>>            channels_;\r
        std::shared_ptr<thumbnail_generator>            thumbnail_generator_;\r
 \r
@@ -186,7 +186,7 @@ struct server::implementation : boost::noncopyable
                                        const auto address = xml_controller.second.get(L"address", L"127.0.0.1");\r
                                        const auto port = xml_controller.second.get<unsigned short>(L"port", 5253);\r
 \r
-                                       osc_servers_.push_back(osc::server(boost::asio::ip::udp::endpoint(boost::asio::ip::address_v4::from_string(narrow(address)), port), monitor_subject_));\r
+                                       osc_client_.push_back(osc::client(boost::asio::ip::udp::endpoint(boost::asio::ip::address_v4::from_string(narrow(address)), port), monitor_subject_));\r
                                }\r
                                else\r
                                        CASPAR_LOG(warning) << "Invalid controller: " << widen(name);   \r