1 files changed, 12 insertions, 30 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 2a7383910c6..707ed7b8225 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -9,43 +9,26 @@
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
 #include "orbsvcs/AV/sfp.h"
 #include "orbsvcs/AV/MCast.h"
+#include "ace/High_Res_Timer.h"
 
-class FTP_Client_Flow_Handler
-  :public virtual ACE_Event_Handler
+class FTP_Client_Callback  : public TAO_AV_Callback
 {
 public:
-  FTP_Client_Flow_Handler (TAO_ORB_Manager *orb_manager,
-                           ACE_Time_Value &timeout);
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg = 0);
-  virtual int start (void);
-  virtual int stop (void);
-  virtual int set_protocol_object (TAO_AV_Protocol_Object *object);
+  FTP_Client_Callback (void);
+  virtual int handle_timeout (void *arg);
+  virtual int handle_destroy (void);
+  virtual void get_timeout (ACE_Time_Value *&tv,
+                            void *&arg);
+  void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
 protected:
-  TAO_ORB_Manager *orb_manager_;
-  long timer_id_;
   int count_;
   TAO_AV_Protocol_Object *protocol_object_;
-  ACE_Time_Value timeout_;
-};
-
-class FTP_Client_Callback
-  :public TAO_AV_Callback
-{
-public:
-  FTP_Client_Callback (FTP_Client_Flow_Handler *handler);
-  virtual int handle_start (void);
-  virtual int handle_stop (void);
-  virtual int handle_end_stream (void);
-protected:
-  FTP_Client_Flow_Handler *handler_;
 };
 
-class FTP_Client_StreamEndPoint
-  :public TAO_Client_StreamEndPoint
+class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
 public:
   FTP_Client_StreamEndPoint (TAO_ORB_Manager *orb_manager = 0);
@@ -57,15 +40,13 @@ public:
                                    TAO_AV_Protocol_Object *object);
 protected:
   TAO_ORB_Manager *orb_manager_;
-  FTP_Client_Flow_Handler *handler_;
   FTP_Client_Callback *callback_;
 };
 
 typedef TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> ENDPOINT_STRATEGY;
 
 class Client;
-class Endpoint_Reactive_Strategy
-  : public ENDPOINT_STRATEGY
+class Endpoint_Reactive_Strategy  : public ENDPOINT_STRATEGY
 {
 public:
   Endpoint_Reactive_Strategy (TAO_ORB_Manager *orb_manager,
@@ -110,6 +91,7 @@ private:
   char *protocol_;
   char *flowname_;
   int use_sfp_;
+  int test_;
 };
 
 typedef ACE_Singleton<Client,ACE_Null_Mutex> CLIENT;