[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "media" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Sat Jun 25 13:32:21 CDT 2011
branch "media" has been updated
via 2c327f96badccd7e11b2e4d3bdb8d1033f7cf6c9 (commit)
via 665876529c03f497b3bbccd91e79c79a5fbcdbe8 (commit)
via 5653908e25f6ae0d60efcd948116f5e5dc772617 (commit)
via 0e9f1777e65e5a5c7212761113f88ce9c1498a0b (commit)
via dcf9d11913279c9ef6f5fe45f5af72e012e1abae (commit)
via d175ef184f14d78b57fa05adcf219f3d1232c3c5 (commit)
via 2dcdf7c744cab378763beef2bd5a757510f9ac9e (commit)
via 890359c63a5abbaa2d95ddb94a14e160d4c8cd4c (commit)
via d6bc941e597ea89db2e70f3b922eab543efa9abd (commit)
from 5e177a61b866349ea29b0f1549b40bf6213d6239 (commit)
Summary of changes:
.gitmodules | 9 ---
CMakeLists.txt | 7 ++-
cmake | 1 -
logger | 1 -
slice | 1 -
.../MediaRTPPJMedia}/RtpConfigurationIf.ice | 9 +--
.../MediaRTPPJMedia}/RtpStateReplicationIf.ice | 10 ++--
src/CMakeLists.txt | 65 +++++++++-----------
src/MediaRTPpjmedia.cpp | 4 +-
src/RTPConfiguration.cpp | 12 ++--
src/RTPSession.cpp | 1 +
src/RTPSession.h | 14 ++--
src/RTPSink.cpp | 1 +
src/RTPSink.h | 2 +-
src/RTPSource.cpp | 1 +
src/RTPSource.h | 2 +-
src/RtpStateReplicator.h | 12 ++--
src/RtpStateReplicatorApp.cpp | 13 ++--
src/RtpStateReplicatorListener.cpp | 5 +-
test/CMakeLists.txt | 32 ++++------
test/TestRTPpjmedia.cpp | 7 +-
21 files changed, 99 insertions(+), 110 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 cmake
delete mode 160000 logger
delete mode 160000 slice
rename {local-slice => slice/AsteriskSCF/Configuration/MediaRTPPJMedia}/RtpConfigurationIf.ice (97%)
rename {local-slice => slice/AsteriskSCF/Replication/MediaRTPPJMedia}/RtpStateReplicationIf.ice (94%)
- Log -----------------------------------------------------------------
commit 2c327f96badccd7e11b2e4d3bdb8d1033f7cf6c9
Merge: 5e177a6 6658765
Author: Joshua Colp <jcolp at digium.com>
Date: Sat Jun 25 15:17:45 2011 -0300
Merge branch 'master' into media
Conflicts:
src/RTPSource.h
diff --cc src/RTPSource.h
index 045caf3,9da0b2a..f032f88
--- a/src/RTPSource.h
+++ b/src/RTPSource.h
@@@ -30,10 -29,8 +30,10 @@@ public
void requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&);
std::string getLocalAddress(const Ice::Current&);
Ice::Int getLocalPort(const Ice::Current&);
+
void setRemoteDetails(const std::string& address, Ice::Int port);
- AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr getStateItem();
+ void setSinks(const AsteriskSCF::Media::V1::StreamSinkSeq&);
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr getStateItem();
/**
* Private implementation data for StreamSourceRTPImpl.
commit 665876529c03f497b3bbccd91e79c79a5fbcdbe8
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:55:31 2011 -0500
Provide 'astscf' prefix for linking to ice-util-cpp library.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a16baeb..3909e11 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
astscf_component_init(media_rtp_pjmedia)
@@ -34,5 +34,5 @@ astscf_component_add_ice_libraries(RtpStateReplicator IceStorm)
astscf_component_add_boost_libraries(RtpStateReplicator thread date_time)
astscf_component_add_slice_collection_libraries(RtpStateReplicator ASTSCF)
astscf_component_build_icebox(RtpStateReplicator)
-target_link_libraries(RtpStateReplicator logging-client ice-util-cpp)
+target_link_libraries(RtpStateReplicator logging-client astscf-ice-util-cpp)
astscf_component_install(RtpStateReplicator)
commit 5653908e25f6ae0d60efcd948116f5e5dc772617
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:40:16 2011 -0500
Install component-specific Slice files.
Use astscf_slice_collection_install() to install the Slice files provided
by each component, that define its interfaces. As part of this change, many
of these Slice files were renamed and moved into different namespaces, to
provide consistency.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4efe681..27d1264 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
+astscf_slice_collection_install(PROJECT)
diff --git a/slice/RtpConfigurationIf.ice b/slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice
similarity index 97%
rename from slice/RtpConfigurationIf.ice
rename to slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice
index c380070..7f41167 100644
--- a/slice/RtpConfigurationIf.ice
+++ b/slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice
@@ -23,10 +23,10 @@
module AsteriskSCF
{
-module Media
+module Configuration
{
-module RTP
+module MediaRTPPJMedia
{
["suppress"]
@@ -174,9 +174,8 @@ module V1
}; /* module V1 */
-}; /* module RTP */
+}; /* module MediaRTPPJMedia */
-}; /* module Media */
+}; /* module Configuration */
}; /* module Asterisk SCF */
-
diff --git a/slice/RtpStateReplicationIf.ice b/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
similarity index 94%
rename from slice/RtpStateReplicationIf.ice
rename to slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
index a8b4ac8..ee5862c 100644
--- a/slice/RtpStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
@@ -27,10 +27,10 @@
module AsteriskSCF
{
-module Media
+module Replication
{
-module RTP
+module MediaRTPPJMedia
{
["suppress"]
@@ -85,7 +85,7 @@ module V1
Ice::Identity mSinkIdentity;
Ice::Identity mSourceIdentity;
AsteriskSCF::Media::V1::FormatSeq mFormats;
- PayloadMap mPayloadstoFormats;
+ AsteriskSCF::Media::RTP::V1::PayloadMap mPayloadstoFormats;
bool mIPv6;
};
@@ -102,8 +102,8 @@ module V1
};
}; /* module V1 */
-}; /* module RTP */
+}; /* module MediaRTPPJMedia */
-}; /* module Media */
+}; /* module Replication */
}; /* module Asterisk SCF */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 872c341..a16baeb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,8 +13,8 @@ astscf_component_add_files(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
astscf_component_add_files(media_rtp_pjmedia RtpStateReplicator.h)
astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.cpp)
astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.h)
-astscf_component_add_slices(media_rtp_pjmedia PROJECT RtpStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia PROJECT RtpConfigurationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
astscf_component_add_slice_collection_libraries(media_rtp_pjmedia ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia)
@@ -28,8 +28,8 @@ astscf_component_install(media_rtp_pjmedia)
astscf_component_init(RtpStateReplicator)
astscf_component_add_files(RtpStateReplicator RtpStateReplicatorApp.cpp)
astscf_component_add_files(RtpStateReplicator RtpStateReplicator.h)
-astscf_component_add_slices(RtpStateReplicator PROJECT RtpStateReplicationIf.ice)
-astscf_component_add_slices(RtpStateReplicator PROJECT RtpConfigurationIf.ice)
+astscf_component_add_slices(RtpStateReplicator PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
+astscf_component_add_slices(RtpStateReplicator PROJECT AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
astscf_component_add_ice_libraries(RtpStateReplicator IceStorm)
astscf_component_add_boost_libraries(RtpStateReplicator thread date_time)
astscf_component_add_slice_collection_libraries(RtpStateReplicator ASTSCF)
diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index c3a09d2..6f59f07 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -44,6 +44,8 @@ using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
+using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
using namespace AsteriskSCF::System::Configuration::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
diff --git a/src/RTPConfiguration.cpp b/src/RTPConfiguration.cpp
index b0a788b..5e8ee26 100644
--- a/src/RTPConfiguration.cpp
+++ b/src/RTPConfiguration.cpp
@@ -26,7 +26,7 @@
#include "RTPConfiguration.h"
using namespace AsteriskSCF::System::Configuration::V1;
-using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
class ConfigurationServiceImplPriv
{
@@ -77,7 +77,7 @@ ConfigurationGroupSeq ConfigurationServiceImpl::getConfiguration(const AsteriskS
}
}
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr& group)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
{
if (!mImplPriv->mGeneralGroup)
{
@@ -115,7 +115,7 @@ ConfigurationGroupSeq ConfigurationServiceImpl::getConfigurationAll(const Asteri
mImplPriv(implPriv), mGroups(visitorGroups) { };
private:
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr&)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr&)
{
if (!mImplPriv->mGeneralGroup)
{
@@ -196,7 +196,7 @@ void ConfigurationServiceImpl::setConfiguration(const AsteriskSCF::System::Confi
}
}
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr& group)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
{
if (!mImplPriv->mGeneralGroup)
{
@@ -256,7 +256,7 @@ void ConfigurationServiceImpl::removeConfigurationItems(const AsteriskSCF::Syste
}
}
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr& group)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
{
if (!mImplPriv->mGeneralGroup)
{
@@ -288,7 +288,7 @@ void ConfigurationServiceImpl::removeConfigurationGroups(const AsteriskSCF::Syst
GroupVisitor(boost::shared_ptr<ConfigurationServiceImplPriv> implPriv) : mImplPriv(implPriv) { };
private:
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr&)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr&)
{
if (!mImplPriv->mGeneralGroup)
{
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 641e5c8..05ce690 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -36,6 +36,7 @@ using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::Discovery;
diff --git a/src/RTPSession.h b/src/RTPSession.h
index 4ba6e86..ed7861e 100644
--- a/src/RTPSession.h
+++ b/src/RTPSession.h
@@ -46,7 +46,7 @@ class RTPSessionImpl : public AsteriskSCF::Media::RTP::V1::RTPSession
public:
RTPSessionImpl(const Ice::ObjectAdapterPtr&, const AsteriskSCF::Media::RTP::V1::RTPServiceLocatorParamsPtr&,
pj_pool_factory*, const AsteriskSCF::System::Component::V1::ReplicaPtr&,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Media::RTP::V1::RtpStateReplicatorPrx>&,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorPrx>&,
const ConfigurationServiceImplPtr&);
RTPSessionImpl(const Ice::ObjectAdapterPtr&, pj_pool_factory*, const Ice::Identity&, const Ice::Identity&,
const Ice::Identity&, Ice::Int, const AsteriskSCF::Media::V1::FormatSeq&, bool,
@@ -66,12 +66,12 @@ public:
int getPayload(const AsteriskSCF::Media::V1::FormatPtr& mediaformat);
StreamSourceRTPImplPtr getSource();
AsteriskSCF::Media::RTP::V1::StreamSinkRTPPtr getSink();
- void replicateState(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr&);
- void removeState(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr&);
+ void replicateState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr&);
+ void removeState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr&);
private:
/**
* Private implementation data for RTPSessionImpl.
diff --git a/src/RTPSink.cpp b/src/RTPSink.cpp
index 41e7b18..2cf4741 100644
--- a/src/RTPSink.cpp
+++ b/src/RTPSink.cpp
@@ -33,6 +33,7 @@ using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
/**
* Private implementation details for the StreamSinkRTPImpl class.
diff --git a/src/RTPSink.h b/src/RTPSink.h
index 6254d5a..3739362 100644
--- a/src/RTPSink.h
+++ b/src/RTPSink.h
@@ -30,7 +30,7 @@ public:
void setRemoteDetails(const std::string&, Ice::Int, const Ice::Current&);
std::string getRemoteAddress(const Ice::Current&);
Ice::Int getRemotePort(const Ice::Current&);
- AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr getStateItem();
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr getStateItem();
private:
/**
* Private implementation data for StreamSinkRTPImpl.
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index 3bc22c1..909bbc5 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -33,6 +33,7 @@ using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
using namespace AsteriskSCF::System::Logging;
namespace
diff --git a/src/RTPSource.h b/src/RTPSource.h
index d12bc48..9da0b2a 100644
--- a/src/RTPSource.h
+++ b/src/RTPSource.h
@@ -30,7 +30,7 @@ public:
std::string getLocalAddress(const Ice::Current&);
Ice::Int getLocalPort(const Ice::Current&);
void setRemoteDetails(const std::string& address, Ice::Int port);
- AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr getStateItem();
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr getStateItem();
/**
* Private implementation data for StreamSourceRTPImpl.
diff --git a/src/RtpStateReplicator.h b/src/RtpStateReplicator.h
index b244dda..7d71e26 100644
--- a/src/RtpStateReplicator.h
+++ b/src/RtpStateReplicator.h
@@ -28,9 +28,9 @@
typedef AsteriskSCF::Replication::StateReplicator<
- AsteriskSCF::Media::RTP::V1::RtpStateReplicator,
- AsteriskSCF::Media::RTP::V1::RtpStateItemPtr,
- std::string, AsteriskSCF::Media::RTP::V1::RtpStateReplicatorListenerPrx> RtpStateReplicatorI;
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicator,
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemPtr,
+ std::string, AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorListenerPrx> RtpStateReplicatorI;
typedef IceUtil::Handle<RtpStateReplicatorI> RtpStateReplicatorIPtr;
@@ -39,15 +39,15 @@ typedef IceUtil::Handle<RtpStateReplicatorI> RtpStateReplicatorIPtr;
//
struct RtpStateReplicatorListenerImpl;
-class RtpStateReplicatorListenerI : public AsteriskSCF::Media::RTP::V1::RtpStateReplicatorListener
+class RtpStateReplicatorListenerI : public AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorListener
{
public:
RtpStateReplicatorListenerI(const Ice::ObjectAdapterPtr&, pj_pool_factory*,
- const AsteriskSCF::Media::RTP::V1::RtpGeneralStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpGeneralStateItemPtr&,
const ConfigurationServiceImplPtr&);
~RtpStateReplicatorListenerI();
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
- void stateSet(const AsteriskSCF::Media::RTP::V1::RtpStateItemSeq&, const Ice::Current&);
+ void stateSet(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemSeq&, const Ice::Current&);
bool operator==(const RtpStateReplicatorListenerI &rhs);
private:
boost::shared_ptr<RtpStateReplicatorListenerImpl> mImpl;
diff --git a/src/RtpStateReplicatorApp.cpp b/src/RtpStateReplicatorApp.cpp
index 7c79412..6f504ab 100644
--- a/src/RtpStateReplicatorApp.cpp
+++ b/src/RtpStateReplicatorApp.cpp
@@ -37,7 +37,8 @@ using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::System::Logging;
using namespace AsteriskSCF::Media::RTP::V1;
-using namespace AsteriskSCF::Media::RTP;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
+using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
using namespace AsteriskSCF::CollocatedIceStorm;
using namespace AsteriskSCF::System::Configuration::V1;
@@ -200,25 +201,25 @@ void RtpStateReplicatorService::registerWithServiceLocator(const Ice::Communicat
ComponentServicePrx componentServicePrx = ComponentServicePrx::checkedCast(componentServiceObjectPrx);
// The GUID passed in to add service needs to be unique for reporting.
- string componentServiceGuid(AsteriskSCF::Media::RTP::V1::StateReplicatorComponentCategory);
+ string componentServiceGuid(AsteriskSCF::Replication::MediaRTPPJMedia::V1::StateReplicatorComponentCategory);
mComponentServiceManagement = ServiceManagementPrx::uncheckedCast(
mServiceLocatorManagement->addService(componentServicePrx, componentServiceGuid));
// Add category as a parameter to enable other components look this component up.
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
- genericparams->category = AsteriskSCF::Media::RTP::V1::StateReplicatorComponentCategory;
+ genericparams->category = AsteriskSCF::Replication::MediaRTPPJMedia::V1::StateReplicatorComponentCategory;
mComponentServiceManagement->addLocatorParams(genericparams, "");
Ice::ObjectPrx stateReplicatorObjectPrx = mAdapter->createDirectProxy(ic->stringToIdentity(ServiceDiscoveryId));
RtpStateReplicatorPrx stateReplicatorPrx = RtpStateReplicatorPrx::checkedCast(stateReplicatorObjectPrx);
- string stateReplicationGuid(AsteriskSCF::Media::RTP::V1::StateReplicatorDiscoveryCategory);
+ string stateReplicationGuid(AsteriskSCF::Replication::MediaRTPPJMedia::V1::StateReplicatorDiscoveryCategory);
mStateReplicationManagement = ServiceManagementPrx::uncheckedCast(
mServiceLocatorManagement->addService(stateReplicatorPrx, stateReplicationGuid));
ServiceLocatorParamsPtr discoveryParams = new ServiceLocatorParams;
- discoveryParams->category = AsteriskSCF::Media::RTP::V1::StateReplicatorDiscoveryCategory;
+ discoveryParams->category = AsteriskSCF::Replication::MediaRTPPJMedia::V1::StateReplicatorDiscoveryCategory;
string replicatorName = ic->getProperties()->getPropertyWithDefault("RtpStateReplicator.Name", "default");
RtpStateReplicatorCompare* nameCompare = new RtpStateReplicatorCompare(replicatorName);
diff --git a/src/RtpStateReplicatorListener.cpp b/src/RtpStateReplicatorListener.cpp
index 4f3cef1..e3af713 100644
--- a/src/RtpStateReplicatorListener.cpp
+++ b/src/RtpStateReplicatorListener.cpp
@@ -30,6 +30,7 @@
using namespace std;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
class RtpStateReplicatorItem
{
@@ -70,7 +71,7 @@ public:
}
void setStateNoticeImpl(const RtpStateItemSeq& items)
{
- class visitor : public AsteriskSCF::Media::RTP::V1::RtpStateItemVisitor
+ class visitor : public AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemVisitor
{
public:
visitor(RtpStateReplicatorListenerImpl *impl) : mImpl(impl)
@@ -134,7 +135,7 @@ public:
}
};
- AsteriskSCF::Media::RTP::V1::RtpStateItemVisitorPtr v = new visitor(this);
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemVisitorPtr v = new visitor(this);
for (RtpStateItemSeq::const_iterator item = items.begin(); item != items.end(); ++item)
{
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7b9cf6b..af97c3f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,13 +1,13 @@
astscf_component_init(media_rtp_pjmedia_test)
astscf_component_add_files(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
-astscf_component_add_slices(media_rtp_pjmedia_test PROJECT RtpStateReplicationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia_test PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia_test)
astscf_component_init(media_rtp_pjmedia_test_v6)
astscf_component_add_files(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
-astscf_component_add_slices(media_rtp_pjmedia_test_v6 PROJECT RtpStateReplicationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia_test_v6 PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test_v6 ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia_test_v6)
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index 7c2ef0b..36eab74 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -40,6 +40,7 @@ using namespace std;
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
/**
* Test service, for loading into icebox
@@ -146,7 +147,7 @@ void TestRtpReplicatorListener::stateRemoved(const Ice::StringSeq&, const Ice::C
void TestRtpReplicatorListener::stateSet(const RtpStateItemSeq& items, const Ice::Current&)
{
- class visitor : public AsteriskSCF::Media::RTP::V1::RtpStateItemVisitor
+ class visitor : public AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemVisitor
{
public:
visitor(TestRtpReplicatorListener *listener) : mListener(listener)
@@ -185,7 +186,7 @@ void TestRtpReplicatorListener::stateSet(const RtpStateItemSeq& items, const Ice
}
};
- AsteriskSCF::Media::RTP::V1::RtpStateItemVisitorPtr v = new visitor(this);
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemVisitorPtr v = new visitor(this);
for (RtpStateItemSeq::const_iterator item = items.begin(); item != items.end(); ++item)
{
commit 0e9f1777e65e5a5c7212761113f88ce9c1498a0b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:24:31 2011 -0500
Use Slice collections support in AsteriskSCF.cmake.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 101bc28..872c341 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
@@ -17,8 +16,9 @@ astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.h)
astscf_component_add_slices(media_rtp_pjmedia PROJECT RtpStateReplicationIf.ice)
astscf_component_add_slices(media_rtp_pjmedia PROJECT RtpConfigurationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
+astscf_component_add_slice_collection_libraries(media_rtp_pjmedia ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia)
-target_link_libraries(media_rtp_pjmedia logging-client astscf-api)
+target_link_libraries(media_rtp_pjmedia logging-client)
pjproject_link(media_rtp_pjmedia pjlib)
pjproject_link(media_rtp_pjmedia pjlib-util)
pjproject_link(media_rtp_pjmedia pjmedia)
@@ -32,6 +32,7 @@ astscf_component_add_slices(RtpStateReplicator PROJECT RtpStateReplicationIf.ice
astscf_component_add_slices(RtpStateReplicator PROJECT RtpConfigurationIf.ice)
astscf_component_add_ice_libraries(RtpStateReplicator IceStorm)
astscf_component_add_boost_libraries(RtpStateReplicator thread date_time)
+astscf_component_add_slice_collection_libraries(RtpStateReplicator ASTSCF)
astscf_component_build_icebox(RtpStateReplicator)
-target_link_libraries(RtpStateReplicator astscf-api logging-client ice-util-cpp)
+target_link_libraries(RtpStateReplicator logging-client ice-util-cpp)
astscf_component_install(RtpStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 51ee9f4..7b9cf6b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,19 +1,17 @@
-include_directories(${API_INCLUDE_DIR})
-
astscf_component_init(media_rtp_pjmedia_test)
astscf_component_add_files(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
astscf_component_add_slices(media_rtp_pjmedia_test PROJECT RtpStateReplicationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia_test)
-target_link_libraries(media_rtp_pjmedia_test astscf-api)
astscf_component_init(media_rtp_pjmedia_test_v6)
astscf_component_add_files(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
astscf_component_add_slices(media_rtp_pjmedia_test_v6 PROJECT RtpStateReplicationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
+astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test_v6 ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia_test_v6)
pjproject_link(media_rtp_pjmedia_test_v6 pjlib)
-target_link_libraries(media_rtp_pjmedia_test_v6 astscf-api)
set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
astscf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
commit dcf9d11913279c9ef6f5fe45f5af72e012e1abae
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:27 2011 -0500
Slice collections, and consistency of naming in various places.
* Support Slice file 'collections'.
* Make all Slice directories in repositories be called 'slice' and at the
top level in the repository, so the automatic 'PROJECT' collection will
be generated for them.
* Build ice-util-cpp and util-cpp as single libraries.
* Enable building and execution of ice-util-cpp top-level unit tests.
Conflicts:
cmake/example/CMakeLists.txt
diff --git a/local-slice/RtpConfigurationIf.ice b/slice/RtpConfigurationIf.ice
similarity index 100%
rename from local-slice/RtpConfigurationIf.ice
rename to slice/RtpConfigurationIf.ice
diff --git a/local-slice/RtpStateReplicationIf.ice b/slice/RtpStateReplicationIf.ice
similarity index 100%
rename from local-slice/RtpStateReplicationIf.ice
rename to slice/RtpStateReplicationIf.ice
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 760ce84..101bc28 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,26 +2,23 @@ include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
-astscf_slice_include_directories(${API_SLICE_DIR})
-
astscf_component_init(media_rtp_pjmedia)
-astscf_component_add_file(media_rtp_pjmedia MediaRTPpjmedia.cpp)
-astscf_component_add_file(media_rtp_pjmedia RTPSession.cpp)
-astscf_component_add_file(media_rtp_pjmedia RTPSource.cpp)
-astscf_component_add_file(media_rtp_pjmedia RTPSink.cpp)
-astscf_component_add_file(media_rtp_pjmedia RTPSession.h)
-astscf_component_add_file(media_rtp_pjmedia RTPSource.h)
-astscf_component_add_file(media_rtp_pjmedia RTPSink.h)
-astscf_component_add_file(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
-astscf_component_add_file(media_rtp_pjmedia RtpStateReplicator.h)
-astscf_component_add_file(media_rtp_pjmedia RTPConfiguration.cpp)
-astscf_component_add_file(media_rtp_pjmedia RTPConfiguration.h)
-astscf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpStateReplicationIf.ice)
-astscf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpConfigurationIf.ice)
+astscf_component_add_files(media_rtp_pjmedia MediaRTPpjmedia.cpp)
+astscf_component_add_files(media_rtp_pjmedia RTPSession.cpp)
+astscf_component_add_files(media_rtp_pjmedia RTPSource.cpp)
+astscf_component_add_files(media_rtp_pjmedia RTPSink.cpp)
+astscf_component_add_files(media_rtp_pjmedia RTPSession.h)
+astscf_component_add_files(media_rtp_pjmedia RTPSource.h)
+astscf_component_add_files(media_rtp_pjmedia RTPSink.h)
+astscf_component_add_files(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
+astscf_component_add_files(media_rtp_pjmedia RtpStateReplicator.h)
+astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.cpp)
+astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.h)
+astscf_component_add_slices(media_rtp_pjmedia PROJECT RtpStateReplicationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia PROJECT RtpConfigurationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
astscf_component_build_icebox(media_rtp_pjmedia)
-target_link_libraries(media_rtp_pjmedia logging-client)
-target_link_libraries(media_rtp_pjmedia asterisk-scf-api)
+target_link_libraries(media_rtp_pjmedia logging-client astscf-api)
pjproject_link(media_rtp_pjmedia pjlib)
pjproject_link(media_rtp_pjmedia pjlib-util)
pjproject_link(media_rtp_pjmedia pjmedia)
@@ -29,15 +26,12 @@ pjproject_link(media_rtp_pjmedia pjnath)
astscf_component_install(media_rtp_pjmedia)
astscf_component_init(RtpStateReplicator)
-astscf_component_add_file(RtpStateReplicator RtpStateReplicatorApp.cpp)
-astscf_component_add_file(RtpStateReplicator RtpStateReplicator.h)
-astscf_component_add_slice(RtpStateReplicator ../local-slice/RtpStateReplicationIf.ice)
-astscf_component_add_slice(RtpStateReplicator ../local-slice/RtpConfigurationIf.ice)
+astscf_component_add_files(RtpStateReplicator RtpStateReplicatorApp.cpp)
+astscf_component_add_files(RtpStateReplicator RtpStateReplicator.h)
+astscf_component_add_slices(RtpStateReplicator PROJECT RtpStateReplicationIf.ice)
+astscf_component_add_slices(RtpStateReplicator PROJECT RtpConfigurationIf.ice)
astscf_component_add_ice_libraries(RtpStateReplicator IceStorm)
-astscf_component_add_ice_libraries(RtpStateReplicator IceBox)
astscf_component_add_boost_libraries(RtpStateReplicator thread date_time)
astscf_component_build_icebox(RtpStateReplicator)
-target_link_libraries(RtpStateReplicator asterisk-scf-api)
-target_link_libraries(RtpStateReplicator logging-client)
-target_link_libraries(RtpStateReplicator ice-util-cpp)
+target_link_libraries(RtpStateReplicator astscf-api logging-client ice-util-cpp)
astscf_component_install(RtpStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6a5886b..51ee9f4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,22 +1,20 @@
include_directories(${API_INCLUDE_DIR})
-astscf_slice_include_directories(${API_SLICE_DIR})
-
astscf_component_init(media_rtp_pjmedia_test)
-astscf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
-astscf_component_add_slice(media_rtp_pjmedia_test ../local-slice/RtpStateReplicationIf.ice)
+astscf_component_add_files(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
+astscf_component_add_slices(media_rtp_pjmedia_test PROJECT RtpStateReplicationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
astscf_component_build_icebox(media_rtp_pjmedia_test)
-target_link_libraries(media_rtp_pjmedia_test asterisk-scf-api)
+target_link_libraries(media_rtp_pjmedia_test astscf-api)
astscf_component_init(media_rtp_pjmedia_test_v6)
-astscf_component_add_file(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
-astscf_component_add_slice(media_rtp_pjmedia_test_v6 ../local-slice/RtpStateReplicationIf.ice)
+astscf_component_add_files(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
+astscf_component_add_slices(media_rtp_pjmedia_test_v6 PROJECT RtpStateReplicationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
astscf_component_build_icebox(media_rtp_pjmedia_test_v6)
pjproject_link(media_rtp_pjmedia_test_v6 pjlib)
+target_link_libraries(media_rtp_pjmedia_test_v6 astscf-api)
set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
-target_link_libraries(media_rtp_pjmedia_test_v6 asterisk-scf-api)
astscf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
astscf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
commit d175ef184f14d78b57fa05adcf219f3d1232c3c5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 3 15:20:33 2011 -0500
Accommodate change from ASTERISK_SCF_ICEBOX_EXPORT to ASTSCF_DLL_EXPORT.
diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index a76217b..c3a09d2 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -639,7 +639,7 @@ void MediaRTPpjmediaApp::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new MediaRTPpjmediaApp;
}
diff --git a/src/RtpStateReplicatorApp.cpp b/src/RtpStateReplicatorApp.cpp
index 189e809..7c79412 100644
--- a/src/RtpStateReplicatorApp.cpp
+++ b/src/RtpStateReplicatorApp.cpp
@@ -348,7 +348,7 @@ void RtpStateReplicatorService::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new RtpStateReplicatorService;
}
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index 1bb6f19..7c2ef0b 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -1170,7 +1170,7 @@ void MediaRTPpjmediaTest::stop()
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new MediaRTPpjmediaTest;
}
commit 2dcdf7c744cab378763beef2bd5a757510f9ac9e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 18:02:07 2011 -0500
Update to use 'astscf' prefix in CMake scripts instead of 'asterisk_scf'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f900169..4efe681 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-asterisk_scf_project(media_rtp_pjmedia 3.4)
+astscf_project(media_rtp_pjmedia 3.4)
add_subdirectory(src)
if(BUILD_TESTING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 859c2e9..760ce84 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,42 +2,42 @@ include_directories(${API_INCLUDE_DIR})
include_directories(${ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(media_rtp_pjmedia)
-asterisk_scf_component_add_file(media_rtp_pjmedia MediaRTPpjmedia.cpp)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPSession.cpp)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPSource.cpp)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPSink.cpp)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPSession.h)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPSource.h)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPSink.h)
-asterisk_scf_component_add_file(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
-asterisk_scf_component_add_file(media_rtp_pjmedia RtpStateReplicator.h)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPConfiguration.cpp)
-asterisk_scf_component_add_file(media_rtp_pjmedia RTPConfiguration.h)
-asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpStateReplicationIf.ice)
-asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpConfigurationIf.ice)
-asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia core thread)
-asterisk_scf_component_build_icebox(media_rtp_pjmedia)
+astscf_component_init(media_rtp_pjmedia)
+astscf_component_add_file(media_rtp_pjmedia MediaRTPpjmedia.cpp)
+astscf_component_add_file(media_rtp_pjmedia RTPSession.cpp)
+astscf_component_add_file(media_rtp_pjmedia RTPSource.cpp)
+astscf_component_add_file(media_rtp_pjmedia RTPSink.cpp)
+astscf_component_add_file(media_rtp_pjmedia RTPSession.h)
+astscf_component_add_file(media_rtp_pjmedia RTPSource.h)
+astscf_component_add_file(media_rtp_pjmedia RTPSink.h)
+astscf_component_add_file(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
+astscf_component_add_file(media_rtp_pjmedia RtpStateReplicator.h)
+astscf_component_add_file(media_rtp_pjmedia RTPConfiguration.cpp)
+astscf_component_add_file(media_rtp_pjmedia RTPConfiguration.h)
+astscf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpStateReplicationIf.ice)
+astscf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpConfigurationIf.ice)
+astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
+astscf_component_build_icebox(media_rtp_pjmedia)
target_link_libraries(media_rtp_pjmedia logging-client)
target_link_libraries(media_rtp_pjmedia asterisk-scf-api)
pjproject_link(media_rtp_pjmedia pjlib)
pjproject_link(media_rtp_pjmedia pjlib-util)
pjproject_link(media_rtp_pjmedia pjmedia)
pjproject_link(media_rtp_pjmedia pjnath)
-asterisk_scf_component_install(media_rtp_pjmedia)
+astscf_component_install(media_rtp_pjmedia)
-asterisk_scf_component_init(RtpStateReplicator)
-asterisk_scf_component_add_file(RtpStateReplicator RtpStateReplicatorApp.cpp)
-asterisk_scf_component_add_file(RtpStateReplicator RtpStateReplicator.h)
-asterisk_scf_component_add_slice(RtpStateReplicator ../local-slice/RtpStateReplicationIf.ice)
-asterisk_scf_component_add_slice(RtpStateReplicator ../local-slice/RtpConfigurationIf.ice)
-asterisk_scf_component_add_ice_libraries(RtpStateReplicator IceStorm)
-asterisk_scf_component_add_ice_libraries(RtpStateReplicator IceBox)
-asterisk_scf_component_add_boost_libraries(RtpStateReplicator thread date_time)
-asterisk_scf_component_build_icebox(RtpStateReplicator)
+astscf_component_init(RtpStateReplicator)
+astscf_component_add_file(RtpStateReplicator RtpStateReplicatorApp.cpp)
+astscf_component_add_file(RtpStateReplicator RtpStateReplicator.h)
+astscf_component_add_slice(RtpStateReplicator ../local-slice/RtpStateReplicationIf.ice)
+astscf_component_add_slice(RtpStateReplicator ../local-slice/RtpConfigurationIf.ice)
+astscf_component_add_ice_libraries(RtpStateReplicator IceStorm)
+astscf_component_add_ice_libraries(RtpStateReplicator IceBox)
+astscf_component_add_boost_libraries(RtpStateReplicator thread date_time)
+astscf_component_build_icebox(RtpStateReplicator)
target_link_libraries(RtpStateReplicator asterisk-scf-api)
target_link_libraries(RtpStateReplicator logging-client)
target_link_libraries(RtpStateReplicator ice-util-cpp)
-asterisk_scf_component_install(RtpStateReplicator)
+astscf_component_install(RtpStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bc8266a..6a5886b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,22 +1,22 @@
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(media_rtp_pjmedia_test)
-asterisk_scf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
-asterisk_scf_component_add_slice(media_rtp_pjmedia_test ../local-slice/RtpStateReplicationIf.ice)
-asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
-asterisk_scf_component_build_icebox(media_rtp_pjmedia_test)
+astscf_component_init(media_rtp_pjmedia_test)
+astscf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
+astscf_component_add_slice(media_rtp_pjmedia_test ../local-slice/RtpStateReplicationIf.ice)
+astscf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
+astscf_component_build_icebox(media_rtp_pjmedia_test)
target_link_libraries(media_rtp_pjmedia_test asterisk-scf-api)
-asterisk_scf_component_init(media_rtp_pjmedia_test_v6)
-asterisk_scf_component_add_file(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
-asterisk_scf_component_add_slice(media_rtp_pjmedia_test_v6 ../local-slice/RtpStateReplicationIf.ice)
-asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
-asterisk_scf_component_build_icebox(media_rtp_pjmedia_test_v6)
+astscf_component_init(media_rtp_pjmedia_test_v6)
+astscf_component_add_file(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
+astscf_component_add_slice(media_rtp_pjmedia_test_v6 ../local-slice/RtpStateReplicationIf.ice)
+astscf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
+astscf_component_build_icebox(media_rtp_pjmedia_test_v6)
pjproject_link(media_rtp_pjmedia_test_v6 pjlib)
set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
target_link_libraries(media_rtp_pjmedia_test_v6 asterisk-scf-api)
-asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
-asterisk_scf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
+astscf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
+astscf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
commit 890359c63a5abbaa2d95ddb94a14e160d4c8cd4c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 16:04:55 2011 -0500
Allow user to disable building of tests.
The CTest module offers a BUILD_TESTING option; if the user turns this option
off, we shouldn't bother building any of our tests.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcbc5c7..f900169 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
asterisk_scf_project(media_rtp_pjmedia 3.4)
add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
commit d6bc941e597ea89db2e70f3b922eab543efa9abd
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 15:11:02 2011 -0500
Remove directories used for submodules.
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a628faf..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "cmake"]
- path = cmake
- url = ../../release/cmake
-[submodule "slice"]
- path = slice
- url = ../../integration/slice
-[submodule "logger"]
- path = logger
- url = git at git.asterisk.org:asterisk-scf/integration/logger
diff --git a/cmake b/cmake
deleted file mode 160000
index 17066de..0000000
--- a/cmake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17066de364794f3befcdcca030ca31d349e83eea
diff --git a/logger b/logger
deleted file mode 160000
index 9b51c72..0000000
--- a/logger
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9b51c7252a9942e3cdc342a2d9b204ec2cc516a2
diff --git a/slice b/slice
deleted file mode 160000
index 03ea08a..0000000
--- a/slice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 03ea08a0f749b5f36ae4dc36d25493689f9e273c
-----------------------------------------------------------------------
--
asterisk-scf/integration/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list