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

[Commits to the Asterisk SCF project code repositories]

branch "replication" has been updated
       via  4fa74bfce6ca302972f471447269c56e6075d660 (commit)
       via  0e966793b9a8f559cb960257496c8f55d541184e (commit)
       via  7de9901a31e7a72d767de614c3ebe1ea3f8e3c48 (commit)
       via  dda37f6ab74478d0c03fccafba90a7b05fad72f4 (commit)
       via  b9291284df422e18419a07fa3bf0682c3f317a60 (commit)
      from  52c0c047c82d57d96aef6cfc702cd0188eb3e3b3 (commit)

Summary of changes:
 src/MediaRTPpjmedia.cpp       |    2 +-
 src/RTPSource.cpp             |    2 +-
 src/RtpStateReplicatorApp.cpp |    2 +-
 test/TestRTPpjmedia.cpp       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 4fa74bfce6ca302972f471447269c56e6075d660
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jan 4 15:56:25 2011 -0600

    Update to be compatible with recent logger changes.

diff --git a/src/RtpStateReplicatorApp.cpp b/src/RtpStateReplicatorApp.cpp
index 8fffef6..2b49c1b 100644
--- a/src/RtpStateReplicatorApp.cpp
+++ b/src/RtpStateReplicatorApp.cpp
@@ -36,7 +36,7 @@ using namespace AsteriskSCF::Media::RTP::V1;
 
 namespace
 {
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
 }
 
 class RtpStateReplicatorService : public IceBox::Service

commit 0e966793b9a8f559cb960257496c8f55d541184e
Merge: 52c0c04 7de9901
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jan 4 15:54:04 2011 -0600

    Merge branch 'master' into replication

diff --cc src/MediaRTPpjmedia.cpp
index 1e7c30b,ddd847e..f770788
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@@ -46,12 -40,9 +46,12 @@@ using namespace AsteriskSCF::SmartProxy
  
  namespace
  {
- Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
+ Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
  }
  
 +static const string ReplicaServiceId("MediaRtpReplica");
 +static const string MediaServiceId("RTPMediaService");
 +
  /**
   * Implementation of the RTPMediaService interface as defined in MediaRTPIf.ice
   */

commit 7de9901a31e7a72d767de614c3ebe1ea3f8e3c48
Author: David M. Lee <dlee at digium.com>
Date:   Fri Dec 10 14:37:16 2010 -0600

    Ref-counting Logger changes.

diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index bddfeda..ddd847e 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -40,7 +40,7 @@ using namespace AsteriskSCF::System::Logging;
 
 namespace
 {
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
 }
 
 /**
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index e25aaf0..2302a54 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -34,7 +34,7 @@ using namespace AsteriskSCF::System::Logging;
 
 namespace
 {
-Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
 }
 
 /**

commit dda37f6ab74478d0c03fccafba90a7b05fad72f4
Merge: b929128 837913f
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 14 10:10:50 2010 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/media_rtp_pjmedia


commit b9291284df422e18419a07fa3bf0682c3f317a60
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 14 10:10:15 2010 -0600

    Add cast so there is no int/char * confusion.

diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index bd882f2..c56da63 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -812,7 +812,7 @@ void MediaRTPpjmediaTest::start(std::string const &name,
         argv.push_back(i->c_str());
     }
     // null terminated list
-    argv.push_back(0);
+    argv.push_back((const char *) 0);
 
     mCachedArgs.argc = argv.size() - 1;
     mCachedArgs.argv = (char**)&argv[0];

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git