*** empty log message ***

4 files changed, 12 insertions, 6 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 7f59e17ed6a..e7188d0b2d2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -30,9 +30,11 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   this->sender_name_ =
     sender_name;
 
+  /* 
   this->sender_ =
     AVStreams::MMDevice::_duplicate (sender);
-
+  */
+ 
   CosNaming::Name name (1);
   name.length (1);
 
@@ -184,7 +186,8 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
 }
 
 void
-Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
+					  ACE_ENV_ARG_DECL)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -232,7 +235,7 @@ Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
                                streamctrl_object);
 
       // Bind the sender and receiver MMDevices.
-      (void) streamctrl->bind_devs (this->sender_.in (),
+      (void) streamctrl->bind_devs (sender,
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
                                     flow_spec
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 8c2e07dbf51..742fd06918e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -49,7 +49,8 @@ public:
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_receivers (AVStreams::MMDevice_ptr sender
+			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 4dd7074aded..5c21b5c9225 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -196,7 +196,8 @@ Distributer::init (int argc,
   ACE_CHECK_RETURN (-1);
 
   // Connect to receivers
-  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (distributer_sender_mmdevice.in ()
+												ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to sender.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 22f7ce39ece..d440d1f55fb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -139,7 +139,8 @@ Sender::init (int argc,
   ACE_CHECK_RETURN (-1);
 
   // Connect to the receivers
-  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (mmdevice.in ()
+								ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;