1 files changed, 16 insertions, 26 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index cddb915e4c8..1d364a1d4ef 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -240,9 +240,6 @@ module AVStreams
       // be used if the streamendpoints have been created independent
       // of a MMDevice
       
-      void unbind_dev(in MMDevice dev, in flowSpec the_spec) 
-        raises (streamOpFailed, noSuchFlow);
-
       void unbind_party (in StreamEndPoint the_ep,
                          in flowSpec the_spec)
         raises (streamOpFailed, noSuchFlow);
@@ -253,11 +250,6 @@ module AVStreams
         raises (streamOpFailed);
       // unbind the stream. Same effect as Basic_StreamCtrl::destroy
       // ()
-
-      VDev get_related_vdev(in MMDevice adev, 
-                            out StreamEndPoint sep) 
-        raises (streamOpFailed);
-
     };
   
   interface MCastConfigIf : CosPropertyService::PropertySet{
@@ -292,7 +284,7 @@ module AVStreams
         raises (PropertyException,
                 streamOpFailed);
       // Multicasting operations are not supported yet.
-  };
+    };
 
   interface StreamEndPoint : CosPropertyService::PropertySet{
       // = DESCRIPTION
@@ -374,7 +366,7 @@ module AVStreams
       void set_source_id (in long source_id);
       // Used to set a unique id for packets sent by this
       // streamendpoint.
-  };
+    };
 
   interface StreamEndPoint_A : StreamEndPoint
     {
@@ -635,27 +627,16 @@ module AVStreams
                              in AVStreams::MCastConfigIf a_mcastconfigif,
                              inout AVStreams::QoS the_qos)
         raises (AVStreams::QoSRequestFailed);
+    };
+
+  interface FlowProducer : FlowEndPoint
+    {
 
       boolean connect_to_peer(inout AVStreams::QoS the_qos,
                               in string address,
                               in string use_flow_protocol) // syntax <flowProtocol>
         raises(failedToConnect,AVStreams::FPError, AVStreams::QoSRequestFailed);
 
-      // Needs to know its peer to choose its protocol correctly
-      // Also to ask for a reverse channel for credit-based flow
-      // control, if one is required
-      string go_to_listen(inout AVStreams::QoS the_qos,
-                          in boolean is_mcast,
-                          in FlowProducer peer,
-                          inout string flowProtocol)// syntax <flowProtocol>
-        // The out value of flowProtocol contains SFP version
-        // supported and all options including "Credit".
-        raises(failedToListen, AVStreams::FPError, 
-               AVStreams::QoSRequestFailed);
-    };
-
-  interface FlowProducer : FlowEndPoint
-    {
       string connect_mcast(inout AVStreams::QoS the_qos,
                            out boolean is_met,
                            in string address,
@@ -673,6 +654,16 @@ module AVStreams
 
   interface FlowConsumer : FlowEndPoint
     {
+
+      // Needs to know its peer to choose its protocol correctly
+      // Also to ask for a reverse channel for credit-based flow
+      // control, if one is required
+      string go_to_listen(inout AVStreams::QoS the_qos,
+                          in boolean is_mcast,
+                          in FlowProducer peer,
+                          inout string flowProtocol)// syntax <flowProtocol>
+        raises(failedToListen, AVStreams::FPError, 
+               AVStreams::QoSRequestFailed);
     };
 
   interface FDev : CosPropertyService::PropertySet {
@@ -759,7 +750,6 @@ module AVStreams
   typedef sequence<StreamEndPoint_A> StreamEndPoint_A_seq;
   typedef sequence<StreamEndPoint_B> StreamEndPoint_B_seq;
   typedef sequence<FlowEndPoint> FlowEndPoint_seq;
-  typedef sequence<Object>  Object_seq;
 };
 
 #endif /* TAO_AV_STREAMS_IDL */