ChangeLogTag:Fri Dec 9 15:30:42 2000 Darrell Brunsch <brunsch@uci.edu>

6 files changed, 44 insertions, 56 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 5c351d7fde4..5743bad85a2 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,20 @@
+Fri Dec  9 15:30:42 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * orbsvcs/orbsvcs/AV.dsp:
+        * orbsvcs/orbsvcs/AV_Static.dsp:
+
+          Added AV_Core.cpp and Nil.cpp.
+
+        * orbsvcs/orbsvcs/AV/AV_Core.cpp:
+
+          Changed to use "File.h" instead of "AV/File.h".
+
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp:
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.h:
+
+          Removed the TAO_AV_Transport_Factory since it is also in 
+          Transport.h and Transport.cpp.
+
 Sat Dec  9 07:55:40 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h: Fixed some
diff --git a/TAO/orbsvcs/orbsvcs/AV.dsp b/TAO/orbsvcs/orbsvcs/AV.dsp
index 186ba065f67..f9980266204 100644
--- a/TAO/orbsvcs/orbsvcs/AV.dsp
+++ b/TAO/orbsvcs/orbsvcs/AV.dsp
@@ -156,6 +156,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=.\AV\AV_Core.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\AV\AVStreams_i.cpp

 # End Source File

 # Begin Source File

@@ -184,6 +188,10 @@ SOURCE=".\AV\media-timer.cpp"
 # End Source File

 # Begin Source File

 

+SOURCE=.\AV\Nil.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Null_MediaCtrlC.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index a67127184d2..fddc3f33551 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1,14 +1,14 @@
 // $Id$
-#include "AV/AV_Core.h"
-#include "AV/Transport.h"
-#include "AV/FlowSpec_Entry.h"
-#include "AV/Protocol_Factory.h"
+#include "AV_Core.h"
+#include "Transport.h"
+#include "FlowSpec_Entry.h"
+#include "Protocol_Factory.h"
 #include "ace/Dynamic_Service.h"
-#include "AV/UDP.h"
-#include "AV/TCP.h"
-#include "AV/RTP.h"
-#include "AV/RTCP.h"
-#include "AV/sfp.h"
+#include "UDP.h"
+#include "TCP.h"
+#include "RTP.h"
+#include "RTCP.h"
+#include "sfp.h"
 
 //------------------------------------------------------------
 // TAO_AV_Core
@@ -343,9 +343,9 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
         //        int index = flow_spec.length () + 1;
         int index = new_flowspec.length ();
         flow_spec.length (index);
-        for (i = 0; i < new_flowspec.length (); i++)
+        for (unsigned int j = 0; j < new_flowspec.length (); j++)
           {
-            flow_spec [i] = new_flowspec [i];
+            flow_spec [j] = new_flowspec [j];
           }
       }
       break;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index a2f48aca5b8..5e71c51fd1e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -4,39 +4,6 @@
 #include "Protocol_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-TAO_AV_Transport_Factory::TAO_AV_Transport_Factory (void)
-{
-}
-
-TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory (void)
-{
-}
-
-int
-TAO_AV_Transport_Factory::init (int /* argc */,
-                                char * /* argv */ [])
-{
-  return -1;
-}
-
-int
-TAO_AV_Transport_Factory::match_protocol (const char * /* protocol_string */)
-{
-  return 0;
-}
-
-TAO_AV_Acceptor *
-TAO_AV_Transport_Factory::make_acceptor (void)
-{
-  return 0;
-}
-
-TAO_AV_Connector *
-TAO_AV_Transport_Factory::make_connector (void)
-{
-  return 0;
-}
-
 // TAO_AV_Flow_Protocol_Factory
 TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
index 3e919b8fb15..8ee289d554f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
@@ -23,18 +23,6 @@
 #include "Policy.h"
 #include "FlowSpec_Entry.h"
 
-class TAO_AV_Export TAO_AV_Transport_Factory : public ACE_Service_Object
-{
-public:
-  TAO_AV_Transport_Factory (void);
-  virtual ~TAO_AV_Transport_Factory (void);
-  virtual int init (int argc, char *argv[]);
-  // Initialization hook.
-  virtual int match_protocol (const char *protocol_string);
-  virtual TAO_AV_Acceptor *make_acceptor (void);
-  virtual TAO_AV_Connector *make_connector (void);
-};
-
 class TAO_AV_Protocol_Object
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/AV_Static.dsp b/TAO/orbsvcs/orbsvcs/AV_Static.dsp
index 2fbccfe8af3..5cdadda7e47 100644
--- a/TAO/orbsvcs/orbsvcs/AV_Static.dsp
+++ b/TAO/orbsvcs/orbsvcs/AV_Static.dsp
@@ -543,6 +543,10 @@ SOURCE=.\AV\UDP.h
 # PROP Default_Filter "cpp"

 # Begin Source File

 

+SOURCE=.\AV\AV_Core.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\AV\AVStreams_i.cpp

 # End Source File

 # Begin Source File

@@ -571,6 +575,10 @@ SOURCE=".\AV\media-timer.cpp"
 # End Source File

 # Begin Source File

 

+SOURCE=.\AV\Nil.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Null_MediaCtrlC.cpp

 # End Source File

 # Begin Source File