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 | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 9af1f2ba80b..47a09d91a75 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -87,7 +87,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (void) { CosNaming::Name name (1); name.length (1); @@ -98,12 +98,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -153,8 +151,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 (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + result = this->bind_to_receiver (); if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -187,8 +184,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->sender_mmdevice_->_this (); ACE_NEW_RETURN (this->streamctrl_, TAO_StreamCtrl, @@ -204,7 +200,6 @@ Sender::init (int argc, the_qos.inout (), flow_spec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (bind_result == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -216,7 +211,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) +Sender::pace_data (void) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -295,7 +290,6 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -325,12 +319,10 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -361,33 +353,27 @@ main (int argc, CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" 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 () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = root_poa->the_POAManager (); - mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mgr->activate (); // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -395,8 +381,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = SENDER::instance ()->pace_data (); } ACE_CATCHANY { @@ -405,7 +390,6 @@ main (int argc, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); SENDER::close (); // Explicitly finalize the Unmanaged_Singleton. |