[asterisk-scf-commits] asterisk-scf/integration/media_operations_core.git branch "rename" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Dec 29 11:00:05 CST 2011
branch "rename" has been created
at ad7c4f329412a971d9aa828a0c5d6f94c9b28276 (commit)
- Log -----------------------------------------------------------------
commit ad7c4f329412a971d9aa828a0c5d6f94c9b28276
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Dec 29 11:00:08 2011 -0600
Adjust names in media_rtp_pjmedia
diff --git a/src/MediaOperationsCore.cpp b/src/MediaOperationsCore.cpp
index 40ac3f2..4dd9975 100644
--- a/src/MediaOperationsCore.cpp
+++ b/src/MediaOperationsCore.cpp
@@ -19,7 +19,7 @@
#include <AsteriskSCF/Component/Component.h>
#include <AsteriskSCF/Media/MediaOperationIf.h>
-#include <AsteriskSCF/PJLib/ThreadHook.h>
+#include <AsteriskSCF/PJLIB/ThreadHook.h>
#include <AsteriskSCF/Logger.h>
#include "MediaOperationReplicationContext.h"
@@ -198,7 +198,7 @@ private:
try
{
Ice::InitializationData id;
- id.threadHook = new AsteriskSCF::PJLib::ThreadHook("Ice");
+ id.threadHook = new AsteriskSCF::PJLIB::ThreadHook("Ice");
id.properties = getCommunicator()->getProperties();
setCommunicator(Ice::initialize(id));
commit 99c1321d2a93f4678248504ccc862399298bf468
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Dec 28 12:17:21 2011 -0600
Adjust for name changes in ice-util-cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2943353..4cee3e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,7 @@ astscf_component_add_slices(MediaOperationsCore PROJECT AsteriskSCF/Replication/
astscf_component_add_slice_collection_libraries(MediaOperationsCore ASTSCF)
astscf_component_add_boost_libraries(MediaOperationsCore core thread date_time)
astscf_component_build_icebox(MediaOperationsCore)
-target_link_libraries(MediaOperationsCore LoggingClient astscf-ice-util-cpp astscf-ice-util-cpp-pjlib)
+target_link_libraries(MediaOperationsCore LoggingClient ASTSCFIceUtilCpp ASTSCFIceUtilCppPJLIB)
pjproject_link(MediaOperationsCore pjlib)
pjproject_link(MediaOperationsCore pjlib-util)
@@ -49,5 +49,5 @@ astscf_component_add_files(MediaOperationStateReplicator MediaOperationStateRepl
astscf_component_add_slices(MediaOperationStateReplicator PROJECT AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.ice)
astscf_component_add_slice_collection_libraries(MediaOperationStateReplicator ASTSCF)
astscf_component_build_icebox(MediaOperationStateReplicator)
-target_link_libraries(MediaOperationStateReplicator LoggingClient astscf-ice-util-cpp)
+target_link_libraries(MediaOperationStateReplicator LoggingClient ASTSCFIceUtilCpp)
astscf_component_install(MediaOperationStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 88140cb..e5bf4b3 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,7 +11,7 @@ astscf_component_add_slice_collection_libraries(MediaOperationsCoreTest ASTSCF)
astscf_component_build_icebox(MediaOperationsCoreTest)
astscf_test_icebox(MediaOperationsCoreTest config/test_component.conf)
-target_link_libraries(MediaOperationsCoreTest astscf-ice-util-cpp)
+target_link_libraries(MediaOperationsCoreTest ASTSCFIceUtilCpp)
pjproject_link(MediaOperationsCoreTest pjsip)
pjproject_link(MediaOperationsCoreTest pjmedia)
commit 0785b19f2b3afd44dcc54a73652789ee6991901c
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 27 16:33:56 2011 -0600
Adjust for slice and logger changes.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 027920a..2943353 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,7 @@ astscf_component_add_slices(MediaOperationsCore PROJECT AsteriskSCF/Replication/
astscf_component_add_slice_collection_libraries(MediaOperationsCore ASTSCF)
astscf_component_add_boost_libraries(MediaOperationsCore core thread date_time)
astscf_component_build_icebox(MediaOperationsCore)
-target_link_libraries(MediaOperationsCore logging-client astscf-ice-util-cpp astscf-ice-util-cpp-pjlib)
+target_link_libraries(MediaOperationsCore LoggingClient astscf-ice-util-cpp astscf-ice-util-cpp-pjlib)
pjproject_link(MediaOperationsCore pjlib)
pjproject_link(MediaOperationsCore pjlib-util)
@@ -49,5 +49,5 @@ astscf_component_add_files(MediaOperationStateReplicator MediaOperationStateRepl
astscf_component_add_slices(MediaOperationStateReplicator PROJECT AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.ice)
astscf_component_add_slice_collection_libraries(MediaOperationStateReplicator ASTSCF)
astscf_component_build_icebox(MediaOperationStateReplicator)
-target_link_libraries(MediaOperationStateReplicator logging-client astscf-ice-util-cpp)
+target_link_libraries(MediaOperationStateReplicator LoggingClient astscf-ice-util-cpp)
astscf_component_install(MediaOperationStateReplicator)
diff --git a/src/DSP.h b/src/DSP.h
index d301f80..b487586 100644
--- a/src/DSP.h
+++ b/src/DSP.h
@@ -23,7 +23,7 @@
#pragma once
#include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/SessionCommunications/TelephonyEventsIf.h>
namespace AsteriskSCF
diff --git a/src/InbandTelephonyEvents.cpp b/src/InbandTelephonyEvents.cpp
index def7016..9a0ebd7 100644
--- a/src/InbandTelephonyEvents.cpp
+++ b/src/InbandTelephonyEvents.cpp
@@ -16,7 +16,7 @@
#include <AsteriskSCF/Helpers/ProxyHelper.h>
#include <AsteriskSCF/SessionCommunications/TelephonyEventsIf.h>
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
#include <AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.h>
#include <IceUtil/UUID.h>
diff --git a/src/MediaOperationFactoryImpl.h b/src/MediaOperationFactoryImpl.h
index caa8f43..53089aa 100644
--- a/src/MediaOperationFactoryImpl.h
+++ b/src/MediaOperationFactoryImpl.h
@@ -19,7 +19,7 @@
#include <Ice/Ice.h>
#include <AsteriskSCF/Media/MediaOperationIf.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "MediaOperationReplicationContext.h"
diff --git a/src/MediaOperationStateReplicatorApp.cpp b/src/MediaOperationStateReplicatorApp.cpp
index ed61e9e..a40cdfb 100644
--- a/src/MediaOperationStateReplicatorApp.cpp
+++ b/src/MediaOperationStateReplicatorApp.cpp
@@ -21,7 +21,7 @@
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
using namespace AsteriskSCF::System::Logging;
diff --git a/src/MediaOperationsCore.cpp b/src/MediaOperationsCore.cpp
index e05165f..40ac3f2 100644
--- a/src/MediaOperationsCore.cpp
+++ b/src/MediaOperationsCore.cpp
@@ -20,7 +20,7 @@
#include <AsteriskSCF/Component/Component.h>
#include <AsteriskSCF/Media/MediaOperationIf.h>
#include <AsteriskSCF/PJLib/ThreadHook.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "MediaOperationReplicationContext.h"
#include "MediaOperationFactoryImpl.h"
diff --git a/src/Translator.h b/src/Translator.h
index 2884875..7adfa60 100644
--- a/src/Translator.h
+++ b/src/Translator.h
@@ -17,7 +17,7 @@
#pragma once
#include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "TranslatorSource.h"
diff --git a/src/TranslatorOperation.h b/src/TranslatorOperation.h
index 152a469..cc63c2f 100644
--- a/src/TranslatorOperation.h
+++ b/src/TranslatorOperation.h
@@ -17,7 +17,7 @@
#pragma once
#include <AsteriskSCF/Media/MediaOperationIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.h>
#include "TranslatorSink.h"
diff --git a/src/TranslatorSink.h b/src/TranslatorSink.h
index 80b07db..2281695 100644
--- a/src/TranslatorSink.h
+++ b/src/TranslatorSink.h
@@ -17,7 +17,7 @@
#pragma once
#include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "Translator.h"
diff --git a/src/TranslatorSource.h b/src/TranslatorSource.h
index f17515a..06bdbf5 100644
--- a/src/TranslatorSource.h
+++ b/src/TranslatorSource.h
@@ -17,7 +17,7 @@
#pragma once
#include <AsteriskSCF/Media/MediaIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
namespace AsteriskSCF
{
diff --git a/src/g722.cpp b/src/g722.cpp
index 038110d..8a070cc 100644
--- a/src/g722.cpp
+++ b/src/g722.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
#include "g722/g722.h"
diff --git a/src/resample.cpp b/src/resample.cpp
index 754d48f..fc0727c 100644
--- a/src/resample.cpp
+++ b/src/resample.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
#include <AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.h>
#include <IceUtil/UUID.h>
diff --git a/src/ulaw_alaw.cpp b/src/ulaw_alaw.cpp
index b3f0722..8093c63 100644
--- a/src/ulaw_alaw.cpp
+++ b/src/ulaw_alaw.cpp
@@ -14,7 +14,7 @@
* at the top of the source tree.
*/
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
#include <AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.h>
#include <IceUtil/UUID.h>
#include <pjmedia.h>
diff --git a/test/TestMediaOperations.cpp b/test/TestMediaOperations.cpp
index bbf2bee..355dfcb 100644
--- a/test/TestMediaOperations.cpp
+++ b/test/TestMediaOperations.cpp
@@ -30,7 +30,7 @@
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/Media/MediaIf.h>
#include <AsteriskSCF/Media/MediaOperationIf.h>
-#include <AsteriskSCF/Media/Formats/AudioFormats.h>
+#include <AsteriskSCF/Media/Formats/AudioFormatsIf.h>
#include <boost/test/debug.hpp>
#include <boost/thread/mutex.hpp>
commit f25679bf3abf1e1c0e61154247a6f83a00206a1d
Merge: 02b503d 8a6b2d8
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 20 16:46:43 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/media_operations_core
commit 02b503d443283568eee042feb7d2941bfe34dacc
Merge: 0b24734 74b4638
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 20 14:36:42 2011 -0600
Merge branch 'inband-events'
diff --cc slice/AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.ice
index ec46309,61fafd0..33e8497
--- a/slice/AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.ice
+++ b/slice/AsteriskSCF/Replication/MediaOperationsCore/MediaOperationsCoreIf.ice
@@@ -33,9 -33,11 +33,11 @@@ module MediaOperationsCor
module V1
{
-const string StateReplicatorComponentCategory = "SipStateReplicatorComponent";
-const string StateReplicatorDiscoveryCategory = "SipStateReplicator";
+const string StateReplicatorComponentCategory = "MediaOperationsCoreStateReplicatorComponent";
+const string StateReplicatorDiscoveryCategory = "MediaOperationsCoreStateReplicator";
+ const string InbandTelephonyEventsDiscoveryCategory = "InbandTelephonyEvents";
+
["visitor"] local class MediaOperationStateItemVisitor
{
};
commit 8a6b2d86d8f1b54523cf81b13cd98d48867b0ea5
Author: Brent Eagles <beagles at digium.com>
Date: Tue Dec 6 16:54:29 2011 -0330
Convert all unit tests to use loopback adapter.
diff --git a/config/test_component.conf b/config/test_component.conf
index d605e16..4af3deb 100644
--- a/config/test_component.conf
+++ b/config/test_component.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Warn.UnknownProperties=0
IceBox.InstanceName=IceBox
-IceBox.ServiceManager.Endpoints=tcp -p 10007
+IceBox.ServiceManager.Endpoints=tcp -h 127.0.0.1 -p 10007
IceBox.Service.MediaOperationsCore=MediaOperationsCore:create
IceBox.Service.ServiceDiscovery=service_locator:create
@@ -11,12 +11,12 @@ IceBox.Service.MediaOperationsCoreTest=MediaOperationsCoreTest:create --log_leve
IceBox.LoadOrder=ServiceDiscovery,MediaOperationsCore,MediaOperationsCoreTest
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4422
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
-MediaOperationsCore.ServiceAdapter.Endpoints=default
+MediaOperationsCore.ServiceAdapter.Endpoints=default -h 127.0.0.1
-MediaOperationsCore.BackplaneAdapter.Endpoints=default
+MediaOperationsCore.BackplaneAdapter.Endpoints=default -h 127.0.0.1
MediaOperationsCore.Standalone=true
@@ -24,19 +24,19 @@ MediaOperationsCore.ComponentTest=false
MediaOperationsCore.ServiceName=MediaOperationsCoreService
-TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1 -p 4421
##########################################
# Service Locator properties
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -p 4421
-ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4423
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
ServiceDiscovery.IceStorm.Trace.TopicManager=2
ServiceDiscovery.IceStorm.Transient=1
ServiceDiscovery.IceStorm.Flush.Timeout=2000
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
-LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -h 127.0.0.1 -p 4412
+LocatorService.Proxy=LocatorService:tcp -h 127.0.0.1 -p 4411
commit 74b46389889d60c6e064101e82f1850fcb348c48
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Oct 27 10:43:29 2011 -0500
Combine two statements into one.
diff --git a/src/InbandTelephonyEvents.cpp b/src/InbandTelephonyEvents.cpp
index e1cebd7..def7016 100644
--- a/src/InbandTelephonyEvents.cpp
+++ b/src/InbandTelephonyEvents.cpp
@@ -392,9 +392,8 @@ MediaOperationPrx InbandTelephonyEventOperationFactory::tryFormat(const FormatSe
void InbandTelephonyEventOperationFactory::createOrUpdateMediaOperation(
const InbandTelephonyEventOperationStateItemPtr& item)
{
- InbandTelephonyEventOperationPtr operation;
-
- operation = InbandTelephonyEventOperationPtr::dynamicCast(mAdapter->find(mAdapter->getCommunicator()->stringToIdentity(item->operationId)));
+ InbandTelephonyEventOperationPtr operation(
+ InbandTelephonyEventOperationPtr::dynamicCast(mAdapter->find(mAdapter->getCommunicator()->stringToIdentity(item->operationId))));
if (operation != 0)
{
-----------------------------------------------------------------------
--
asterisk-scf/integration/media_operations_core.git
More information about the asterisk-scf-commits
mailing list