diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp index b6a3c85341c..8e835439b85 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp @@ -26,7 +26,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb) void Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -45,7 +45,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, this->sender_context_ = this->naming_client_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -60,7 +60,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Try binding the receivers context under the sender context. this->receiver_context_ = this->sender_context_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex) @@ -76,7 +76,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->sender_context_ = @@ -88,13 +88,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = CosNaming::NamingContext::_narrow (object.in ()); - this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -106,12 +106,12 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Register the sender object with the sender context. this->sender_context_->rebind (name, sender - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -121,12 +121,12 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) this->receiver_context_->list (chunk, binding_list, iterator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the receivers found in the bindinglist to the <receivers>. this->add_to_receivers (binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (iterator.in ())) @@ -138,11 +138,11 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) { more = iterator->next_n (chunk, binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->add_to_receivers (binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -150,7 +150,7 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) void Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong i = 0; i < binding_list.length (); @@ -169,7 +169,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list // context. CORBA::Object_var obj = this->receiver_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); AVStreams::MMDevice_var receiver_device = AVStreams::MMDevice::_narrow (obj.in ()); @@ -185,7 +185,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list } void -Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL) { // Connect to all receivers that we know about. for (Receivers::iterator iterator = this->receivers_.begin (); @@ -224,7 +224,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the flowname and the corresponding stream controller to @@ -237,7 +237,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) (*iterator).int_id_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -246,7 +246,7 @@ void Connection_Manager::bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, AVStreams::MMDevice_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -272,7 +272,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -290,7 +290,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Find the receivers context under the sender's context object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = @@ -304,7 +304,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the sender context this->sender_context_ = this->naming_client_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; name [0].id = @@ -313,7 +313,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the receivers context under the sender's context this->receiver_context_ = this->sender_context_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -329,7 +329,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Register this receiver object under the receiver context. this->receiver_context_->rebind (name, receiver - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ -346,11 +346,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::Object_var object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); this->sender_ = - AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) @@ -363,7 +363,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, } void -Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->sender_.in ())) return; @@ -399,7 +399,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ -418,7 +418,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) this->receiver_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == 0) @@ -428,19 +428,19 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) // Start the data sending. AVStreams::flowSpec start_spec; streamctrl->start (start_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::add_streamctrl (const ACE_CString &flowname, TAO_StreamEndPoint *endpoint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the stream controller for this endpoint. CORBA::Any_ptr streamctrl_any = endpoint->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -452,7 +452,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, } void -Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::destroy (ACE_ENV_SINGLE_ARG_DECL) { AVStreams::flowSpec stop_spec; @@ -466,7 +466,7 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) for (int i = 0 ; i < size; i++) { (*iterator).int_id_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; iterator.advance (); } @@ -478,7 +478,7 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) void Connection_Manager::destroy (const ACE_CString &flowname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->protocol_objects_.unbind (flowname); this->receivers_.unbind (flowname); @@ -489,14 +489,14 @@ Connection_Manager::destroy (const ACE_CString &flowname AVStreams::flowSpec stop_spec; streamctrl->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::unbind_sender (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender_mmdevice_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -513,7 +513,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name, { CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var sender_context = @@ -527,7 +527,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name, { object = sender_context->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Sender); AVStreams::MMDevice_var mmdevice = @@ -536,7 +536,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name, if (mmdevice->_is_equivalent (sender_mmdevice_obj)) { sender_context->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Sender); if (TAO_debug_level > 0) @@ -583,7 +583,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, { CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var sender_context = @@ -600,7 +600,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, object = sender_context->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Receiver); if (TAO_debug_level > 0) @@ -615,7 +615,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, object = receivers_context->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Receiver); AVStreams::MMDevice_var mmdevice = @@ -624,7 +624,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, if (mmdevice->_is_equivalent (receiver_mmdevice)) { receivers_context->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Receiver); if (TAO_debug_level > 0) |