diff options
author | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-01 22:20:44 +0000 |
---|---|---|
committer | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-04-01 22:20:44 +0000 |
commit | b042ef6ee7729d1c8aadc6052f6d24ba29fd06fe (patch) | |
tree | fb08b886cb364e3527754ffa7b3c1ab7b667f32f /TAO | |
parent | acfa08e28a54440b32d1377e86147fedb380fb08 (diff) | |
download | ATCD-b042ef6ee7729d1c8aadc6052f6d24ba29fd06fe.tar.gz |
*** empty log message ***
Diffstat (limited to 'TAO')
4 files changed, 31 insertions, 10 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 21ef343edd6..35bb8df0c3d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -279,8 +279,13 @@ Client::run (void) &addr); flow_spec [0] = entry.entry_to_string (); flow_spec.length (1); + + AVStreams::MMDevice_var client_mmdevice + = this->client_mmdevice_._this (ACE_TRY_ENV); + ACE_TRY_CHECK; + CORBA::Boolean result = - this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV), + this->streamctrl_.bind_devs (client_mmdevice.in (), AVStreams::MMDevice::_nil (), the_qos.inout (), flow_spec, diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 52da2794beb..558069fe186 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -94,7 +94,9 @@ Server::init (int argc, CosNaming::Name server_mmdevice_name (1); server_mmdevice_name.length (1); server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1"); - AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV); + ACE_TRY_CHECK; + ACE_TRY_EX (bind) { // Register the video control object with the naming server. diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index e14bc5b9420..50247d880d6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -316,8 +316,13 @@ Client::run (void) &addr); flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); flow_spec.length (1); + + AVStreams::MMDevice_var client_mmdevice = + this->client_mmdevice_._this (ACE_TRY_ENV); + ACE_TRY_CHECK; + CORBA::Boolean result = - this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV), + this->streamctrl_.bind_devs (client_mmdevice.in (), AVStreams::MMDevice::_nil (), the_qos.inout (), flow_spec, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index c6d648a585a..66d080ef8c4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -171,9 +171,11 @@ Client::init (int argc, TAO_AV_CORE::instance ()->poa ()); // Parse the command line arguments - this->parse_args (argc, - argv); + int result = this->parse_args (argc, + argv); + if (result != 0) + return result; // Open file to read. this->fp_ = ACE_OS::fopen (this->filename_, @@ -184,12 +186,15 @@ Client::init (int argc, this->filename_), -1); + result + = this->bind_to_server (ACE_TRY_ENV); + // Resolve the object reference of the server from the Naming Service. - if (this->bind_to_server (ACE_TRY_ENV) == -1) + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), -1); - + // Create the Flow protocol name char flow_protocol_str [BUFSIZ]; if (this->use_sfp_) @@ -226,16 +231,20 @@ Client::init (int argc, flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); flow_spec.length (1); + AVStreams::MMDevice_var client_mmdevice = + this->client_mmdevice_._this (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + // Bind/Connect the client and server MMDevices. - CORBA::Boolean result = - this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV), + CORBA::Boolean bind_result = + this->streamctrl_.bind_devs (client_mmdevice.in (), this->server_mmdevice_.in (), the_qos.inout (), flow_spec, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (result == 0) + if (bind_result == 0) ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1); return 0; |