summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/AV
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV')
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h20
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Makefile.am42
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTP.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/default_resource.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/default_resource.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/sfp.h4
15 files changed, 85 insertions, 43 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index f53b3ddba1d..b5b79a52ae4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -29,20 +29,20 @@
#include "ace/SOCK_Acceptor.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/CosPropertyServiceS.h"
-#include "orbsvcs/AVStreamsS.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/Null_MediaCtrlS.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/orbsvcs/AVStreamsS.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/Null_MediaCtrlS.h"
#if defined (TAO_ORBSVCS_HAS_Trader)
-#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
#endif /* TAO_ORBSVCS_HAS_Trader */
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
#define FLOWSPEC_MAX 5
// for the Hash_Map helper classes.
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 08597e73734..f97ad1cb0aa 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1,22 +1,22 @@
// $Id$
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
-#include "orbsvcs/AV/UDP.h"
-#include "orbsvcs/AV/TCP.h"
-#include "orbsvcs/AV/RTP.h"
-#include "orbsvcs/AV/RTCP.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/default_resource.h"
+#include "orbsvcs/orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/UDP.h"
+#include "orbsvcs/orbsvcs/AV/TCP.h"
+#include "orbsvcs/orbsvcs/AV/RTP.h"
+#include "orbsvcs/orbsvcs/AV/RTCP.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/default_resource.h"
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
-#include "orbsvcs/AV/QoS_UDP.h"
+#include "orbsvcs/orbsvcs/AV/QoS_UDP.h"
#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
#if defined (ACE_HAS_SCTP)
-#include "orbsvcs/AV/SCTP_SEQ.h"
+#include "orbsvcs/orbsvcs/AV/SCTP_SEQ.h"
#endif // ACE_HAS_SCTP
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index d6ac2037153..1cc2e78de16 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -15,8 +15,8 @@
#include /**/ "ace/pre.h"
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/AVStreamsC.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AVStreamsC.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
#include "ace/Singleton.h"
#include "ace/Unbounded_Set.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index e171286341a..8abf7e851f4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -16,7 +16,7 @@
#define TAO_AV_FLOWSPEC_ENTRY_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
#include "AV_Core.h"
#include "ace/Addr.h"
#include "ace/Containers.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Makefile.am b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
new file mode 100644
index 00000000000..8aa87e9e67d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
@@ -0,0 +1,42 @@
+##---------------------------------------------------------------------------
+## $Id$
+##
+## Makefile for TAO's Audio/Visual (AV) Service library
+##
+##---------------------------------------------------------------------------
+
+##
+## Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_AV.la
+
+libTAO_AV_la_LDADD = \
+ $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_AV_la_SOURCES = \
+ AVStreams_i.cpp \
+ Endpoint_Strategy.cpp \
+ Endpoint_Strategy_T.cpp \
+ sfp.cpp
+
+noinst_HEADERS = \
+ AVStreams_i.h \
+ Endpoint_Strategy.h \
+ Endpoint_Strategy_T.h \
+ sfp.h
+
+EXTRA_DIST = README
+
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+ -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 24fd3082914..b26ef80acfb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -18,7 +18,7 @@
#include "ace/Addr.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
struct TAO_AV_frame_info
{
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index b4420b21ee5..cdc48d2316a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -6,12 +6,12 @@
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
#include "UDP.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Fill_ACE_QoS.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/QoS_UDP.i"
+#include "orbsvcs/orbsvcs/AV/QoS_UDP.i"
#endif /* __ACE_INLINE__ */
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index ebc49bc6147..702fc27aa90 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -29,7 +29,7 @@
#include "ace/QoS/QoS_Decorator.h"
#include "ace/QoS/SOCK_Dgram_Mcast_QoS.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 38555b63efd..4465ae7cf25 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -51,11 +51,11 @@
// FUZZ: disable check_for_math_include
#include "ace/OS.h"
#include "ace/Hash_Map_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/UDP.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/UDP.h"
#include <math.h>
#include <stdlib.h>
-#include "orbsvcs/AV/RTP.h"
+#include "orbsvcs/orbsvcs/AV/RTP.h"
#include "RTCP_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index 1af28588edd..a6ef7fef8ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -50,8 +50,8 @@
#define TAO_AV_RTP_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#define RTP_PT_BVC 22 /* Berkeley video codec */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
index aa50d43203d..d38e975de83 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -12,7 +12,7 @@
#define TAO_AV_DEFAULT_RESOURCE_FCATORY_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 8de06427317..8ca19263633 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -22,7 +22,7 @@
#include "ace/Connector.h"
#include "ace/Addr.h"
#include "ace/SOCK_Dgram.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
#include "FlowSpec_Entry.h"
#include "AV_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index e29c8e154ce..4c8b45256dc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "orbsvcs/AV/default_resource.h"
+#include "orbsvcs/orbsvcs/AV/default_resource.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
index 01420bb907f..2867e024e28 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
@@ -13,8 +13,8 @@
#define TAO_AV_DEFAULT_RESOURCE_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Resource_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Resource_Factory.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index 1885a633231..70bba33f830 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -14,8 +14,8 @@
#define TAO_AV_SFP_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/sfpC.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/sfpC.h"
#include "ace/SOCK_Dgram.h"
#include "ace/INET_Addr.h"
View Lorry Controller Status