[asterisk-scf-commits] asterisk-scf/release/media_operations_core.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Dec 30 14:51:04 CST 2011
branch "master" has been updated
via ad7c4f329412a971d9aa828a0c5d6f94c9b28276 (commit)
via 99c1321d2a93f4678248504ccc862399298bf468 (commit)
via 0785b19f2b3afd44dcc54a73652789ee6991901c (commit)
from f25679bf3abf1e1c0e61154247a6f83a00206a1d (commit)
Summary of changes:
src/CMakeLists.txt | 4 ++--
src/DSP.h | 2 +-
src/InbandTelephonyEvents.cpp | 2 +-
src/MediaOperationFactoryImpl.h | 2 +-
src/MediaOperationStateReplicatorApp.cpp | 2 +-
src/MediaOperationsCore.cpp | 6 +++---
src/Translator.h | 2 +-
src/TranslatorOperation.h | 2 +-
src/TranslatorSink.h | 2 +-
src/TranslatorSource.h | 2 +-
src/g722.cpp | 2 +-
src/resample.cpp | 2 +-
src/ulaw_alaw.cpp | 2 +-
test/CMakeLists.txt | 2 +-
test/TestMediaOperations.cpp | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
- 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>
-----------------------------------------------------------------------
--
asterisk-scf/release/media_operations_core.git
More information about the asterisk-scf-commits
mailing list