[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  1731ae522c7555260e9598e4913daf847392304d (commit)
      from  31c6fde85dfee23062ccc472221ac262a0b28363 (commit)

Summary of changes:
 CMakeLists.txt          |    4 ++--
 src/CMakeLists.txt      |   24 ++++++++++++------------
 src/MediaRTPpjmedia.cpp |    2 +-
 test/CMakeLists.txt     |   14 +++++++-------
 4 files changed, 22 insertions(+), 22 deletions(-)


- Log -----------------------------------------------------------------
commit 1731ae522c7555260e9598e4913daf847392304d
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Oct 14 18:51:35 2010 -0500

    Replacing references to project's old internal working name.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceec66d..c61faa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(NOT integrated_build STREQUAL "true")
    # Include pjproject build integration
    include(cmake/modules/pjproject.cmake)
 
-   # Include common Hydra build infrastructure
+   # Include common AsteriskSCF build infrastructure
    include(cmake/AsteriskSCF.cmake)
 
    # Add build targets for what we will need to link against
@@ -27,7 +27,7 @@ if(NOT integrated_build STREQUAL "true")
    pjproject_build(third_party)
 
    # This project is C++ based and requires a minimum of 3.4
-   hydra_project(media_rtp_pjmedia 3.4 CXX)
+   asterisk_scf_project(media_rtp_pjmedia 3.4 CXX)
 
    # Knock out slice definitions
    add_subdirectory(slice EXCLUDE_FROM_ALL)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 14cd228..b2daf31 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,16 +6,16 @@
 # All rights reserved.
 #
 
-hydra_component_init(media_rtp_pjmedia CXX)
-hydra_component_add_slice(media_rtp_pjmedia ServiceLocatorIf)
-hydra_component_add_slice(media_rtp_pjmedia MediaIf)
-hydra_component_add_slice(media_rtp_pjmedia MediaRTPIf)
-hydra_component_add_slice(media_rtp_pjmedia ComponentServiceIf)
-hydra_component_add_file(media_rtp_pjmedia MediaRTPpjmedia.cpp)
-hydra_component_add_file(media_rtp_pjmedia RTPSession.cpp)
-hydra_component_add_file(media_rtp_pjmedia RTPSource.cpp)
-hydra_component_add_file(media_rtp_pjmedia RTPSink.cpp)
-hydra_component_add_boost_libraries(media_rtp_pjmedia core thread)
+asterisk_scf_component_init(media_rtp_pjmedia CXX)
+asterisk_scf_component_add_slice(media_rtp_pjmedia ServiceLocatorIf)
+asterisk_scf_component_add_slice(media_rtp_pjmedia MediaIf)
+asterisk_scf_component_add_slice(media_rtp_pjmedia MediaRTPIf)
+asterisk_scf_component_add_slice(media_rtp_pjmedia ComponentServiceIf)
+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_boost_libraries(media_rtp_pjmedia core thread)
 
 if(NOT logger_dir)
    message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -23,10 +23,10 @@ endif()
 include_directories(${logger_dir}/common)
 include_directories(${logger_dir}/client/src)
 
-hydra_component_build_icebox(media_rtp_pjmedia)
+asterisk_scf_component_build_icebox(media_rtp_pjmedia)
 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)
 pjproject_link(media_rtp_pjmedia pjnath)
-#hydra_component_install(media_rtp_pjmedia RUNTIME bin "pjmedia RTP Media." Media)
+#asterisk_scf_component_install(media_rtp_pjmedia RUNTIME bin "pjmedia RTP Media." Media)
diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index 9628a97..65f6ed4 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -295,7 +295,7 @@ void MediaRTPpjmediaApp::stop()
 
 extern "C"
 {
-   HYDRA_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
+   ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr communicator)
    {
       return new MediaRTPpjmediaApp;
    }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0ae9671..774e512 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,13 +6,13 @@
 # All rights reserved.
 #
 
-hydra_component_init(media_rtp_pjmedia_test CXX)
-hydra_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
-hydra_component_add_slice(media_rtp_pjmedia_test MediaIf)
-hydra_component_add_slice(media_rtp_pjmedia_test MediaRTPIf)
-hydra_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread)
-hydra_component_build_icebox(media_rtp_pjmedia_test)
-#hydra_component_install(media_rtp_pjmedia_test RUNTIME bin "PJmedia RTP Media Test Driver." Core)
+asterisk_scf_component_init(media_rtp_pjmedia_test CXX)
+asterisk_scf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
+asterisk_scf_component_add_slice(media_rtp_pjmedia_test MediaIf)
+asterisk_scf_component_add_slice(media_rtp_pjmedia_test MediaRTPIf)
+asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread)
+asterisk_scf_component_build_icebox(media_rtp_pjmedia_test)
+#asterisk_scf_component_install(media_rtp_pjmedia_test RUNTIME bin "PJmedia RTP Media Test Driver." Core)
 
 # integration test
 if(integrated_build STREQUAL "true")

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/media_rtp_pjmedia.git