diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 8cb7ae5514b..ad7efd60bf6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -82,7 +82,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -92,12 +92,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -111,7 +111,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -148,7 +148,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -182,7 +182,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -198,7 +198,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -211,7 +211,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -289,7 +289,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -319,12 +319,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -351,37 +351,37 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -390,7 +390,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |