changed term prenumeration to subscription in OSC implementation

diff --git a/protocol/osc/client.cpp b/protocol/osc/client.cpp
index f6c2001b1407c15a56f559c3edfa60121e58a907..b9cb03f399138ff2bbf7cc18f08d2cc8d693e768 100644 (file)
--- a/protocol/osc/client.cpp
+++ b/protocol/osc/client.cpp
@@ -96,7 +96,7 @@ public:
                source.link_target(&on_next_);
        }
 
-       std::shared_ptr<void> get_prenumeration_token(
+       std::shared_ptr<void> get_subscription_token(
                        const boost::asio::ip::udp::endpoint& endpoint)
        {
                tbb::spin_mutex::scoped_lock lock(endpoints_mutex_);
@@ -180,10 +180,10 @@ client::~client()
 {
 }
 
-std::shared_ptr<void> client::get_prenumeration_token(
+std::shared_ptr<void> client::get_subscription_token(
                        const boost::asio::ip::udp::endpoint& endpoint)
 {
-       return impl_->get_prenumeration_token(endpoint);
+       return impl_->get_subscription_token(endpoint);
 }
 
 }}}

diff --git a/protocol/osc/client.h b/protocol/osc/client.h
index 795d4f85a7c1074fa362a7c73250eb28d5205a04..d79cccd53adc6324a03c24debde6503808988741 100644 (file)
--- a/protocol/osc/client.h
+++ b/protocol/osc/client.h
@@ -46,7 +46,7 @@ public:
        client(client&&);
 
        /**
-        * Get a prenumeration token that ensures that OSC messages are sent to the
+        * Get a subscription token that ensures that OSC messages are sent to the
         * given endpoint as long as the token is alive. It will stop sending when
         * the token is dropped unless another token to the same endpoint has
         * previously been checked out.
@@ -55,7 +55,7 @@ public:
         *
         * @return The token. It is ok for the token to outlive the client
         */
-       std::shared_ptr<void> get_prenumeration_token(
+       std::shared_ptr<void> get_subscription_token(
                        const boost::asio::ip::udp::endpoint& endpoint);
 
        ~client();

diff --git a/shell/server.cpp b/shell/server.cpp
index 967076513f38b4d96f7a3f02bb0ba37acd21102d..9b0f5cb9d971f6e3f58d8f1946e0a663deb4a51c 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -80,7 +80,7 @@ struct server::implementation : boost::noncopyable
        std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_;     \r
        std::shared_ptr<IO::AsyncEventServer>           primary_amcp_server_;\r
        osc::client                                                                     osc_client_;\r
-       std::vector<std::shared_ptr<void>>                      predefined_osc_prenumerations_;\r
+       std::vector<std::shared_ptr<void>>                      predefined_osc_subscriptions_;\r
        std::vector<safe_ptr<video_channel>>            channels_;\r
        std::shared_ptr<thumbnail_generator>            thumbnail_generator_;\r
 \r
@@ -128,8 +128,8 @@ struct server::implementation : boost::noncopyable
        {               \r
                ffmpeg::uninit();\r
 \r
-               async_servers_.clear();\r
                primary_amcp_server_.reset();\r
+               async_servers_.clear();\r
                channels_.clear();\r
        }\r
 \r
@@ -269,8 +269,8 @@ struct server::implementation : boost::noncopyable
                                                predefined_client.second.get<std::wstring>(L"address");\r
                                const auto port =\r
                                                predefined_client.second.get<unsigned short>(L"port");\r
-                               predefined_osc_prenumerations_.push_back(\r
-                                               osc_client_.get_prenumeration_token(udp::endpoint(\r
+                               predefined_osc_subscriptions_.push_back(\r
+                                               osc_client_.get_subscription_token(udp::endpoint(\r
                                                                address_v4::from_string(narrow(address)),\r
                                                                port)));\r
                        }\r
@@ -283,7 +283,7 @@ struct server::implementation : boost::noncopyable
                                        {\r
                                                using namespace boost::asio::ip;\r
 \r
-                                               return osc_client_.get_prenumeration_token(\r
+                                               return osc_client_.get_subscription_token(\r
                                                                udp::endpoint(\r
                                                                                address_v4::from_string(ipv4_address),\r
                                                                                default_port));\r