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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  e605e6f1425c816fd588b9d5ee4c35215e1e9a40 (commit)
      from  7de9901a31e7a72d767de614c3ebe1ea3f8e3c48 (commit)

Summary of changes:
 src/CMakeLists.txt      |    3 +--
 src/MediaRTPpjmedia.cpp |   12 ++++++------
 src/RTPSession.cpp      |    4 ++--
 src/RTPSink.cpp         |    4 ++--
 src/RTPSource.cpp       |    6 +++---
 test/TestRTPpjmedia.cpp |    6 +++---
 6 files changed, 17 insertions(+), 18 deletions(-)


- Log -----------------------------------------------------------------
commit e605e6f1425c816fd588b9d5ee4c35215e1e9a40
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Jan 7 14:55:08 2011 -0600

    Adjust #includes to use <> and prefix paths with AsteriskSCF.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb0c5ca..71f793f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,8 +23,7 @@ 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}")
 endif()
-include_directories(${logger_dir}/common)
-include_directories(${logger_dir}/client/src)
+include_directories(${logger_dir}/include)
 
 asterisk_scf_component_build_icebox(media_rtp_pjmedia)
 target_link_libraries(media_rtp_pjmedia logging-client)
diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index ddd847e..6fb92b3 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -22,12 +22,12 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "Media/MediaIf.h"
-#include "Media/RTP/MediaRTPIf.h"
-#include "System/Component/ComponentServiceIf.h"
-#include "IceLogger.h"
-#include "logger.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.h>
+#include <AsteriskSCF/Logger/IceLogger.h>
+#include <AsteriskSCF/logger.h>
 
 #include "RTPSession.h"
 
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index b61a4a2..fa6fbf7 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -19,8 +19,8 @@
 #include <pjlib.h>
 #include <pjmedia.h>
 
-#include "Media/MediaIf.h"
-#include "Media/RTP/MediaRTPIf.h"
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
 
 #include "RTPSession.h"
 #include "RTPSource.h"
diff --git a/src/RTPSink.cpp b/src/RTPSink.cpp
index 3e80164..23d7bdd 100644
--- a/src/RTPSink.cpp
+++ b/src/RTPSink.cpp
@@ -19,8 +19,8 @@
 #include <pjlib.h>
 #include <pjmedia.h>
 
-#include "Media/MediaIf.h"
-#include "Media/RTP/MediaRTPIf.h"
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
 
 #include "RTPSession.h"
 #include "RTPSink.h"
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index 2302a54..7125fb4 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -19,12 +19,12 @@
 #include <pjlib.h>
 #include <pjmedia.h>
 
-#include "Media/MediaIf.h"
-#include "Media/RTP/MediaRTPIf.h"
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
+#include <AsteriskSCF/logger.h>
 
 #include "RTPSession.h"
 #include "RTPSource.h"
-#include "logger.h"
 
 using namespace std;
 using namespace AsteriskSCF::Core::Discovery::V1;
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index db25703..e71ffc6 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -23,9 +23,9 @@
 #include <Ice/Ice.h>
 #include <IceBox/IceBox.h>
 
-#include "Core/Discovery/ServiceLocatorIf.h"
-#include "Media/MediaIf.h"
-#include "Media/RTP/MediaRTPIf.h"
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
+#include <AsteriskSCF/Media/MediaIf.h>
+#include <AsteriskSCF/Media/RTP/MediaRTPIf.h>
 
 using namespace std;
 using namespace AsteriskSCF::Core::Discovery::V1;

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


-- 
asterisk-scf/release/media_rtp_pjmedia.git