[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "transfer" updated.

[Commits to the Asterisk SCF project code repositories]

branch "transfer" has been updated
       via  b36726c113af2090a69d14b82ed22b23656ec4a7 (commit)
      from  82462aa0606a562c8e9858b96a343211fb8ea138 (commit)

Summary of changes:
 src/BridgeImpl.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit b36726c113af2090a69d14b82ed22b23656ec4a7
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Oct 12 10:52:37 2010 -0230

    Add setBridge/removeBridge calls to other appropriate sites.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index cdcbadb..daa8440 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -61,7 +61,7 @@ namespace BridgeService
 
         void operator()(const BridgeImpl::BridgeSession& b) 
         {
-            b.session->removeListener(mListener);
+            b.session->removeBridge(mListener);
             b.session->stop(mResponse);
             if(b.connector)
             {
@@ -305,7 +305,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::addSessions(const AsteriskSCF::Sess
                 continue;
             }
 
-            AsteriskSCF::SessionCommunications::V1::SessionInfoPtr info = (*i)->addListener(mSessionListenerPrx);
+            AsteriskSCF::SessionCommunications::V1::SessionInfoPtr info = (*i)->setBridge(mPrx, mSessionListenerPrx);
             //
             // We need to define these states! Especially the ones that define when start is called or not.
             //
@@ -355,7 +355,7 @@ void AsteriskSCF::BridgeService::BridgeImpl::removeSessions(const AsteriskSCF::S
             std::vector<BridgeSession>::iterator j = std::find_if(mSessions.begin(), mSessions.end(), AsteriskSCF::BridgeService::FindImpl(*i));
             if(j != mSessions.end())
             {
-                j->session->removeListener(mSessionListenerPrx);
+                j->session->removeBridge(mSessionListenerPrx);
                 j->connector->unplug();
                 mSessions.erase(j);
                 removedSessions.push_back(*i);
@@ -472,7 +472,6 @@ void AsteriskSCF::BridgeService::BridgeImpl::replaceSession(const AsteriskSCF::S
         }
     }
    
-
     AsteriskSCF::SessionCommunications::V1::SessionInfoPtr info = newSession->setBridge(mPrx, mSessionListenerPrx);
 
     //
@@ -559,7 +558,7 @@ size_t AsteriskSCF::BridgeService::BridgeImpl::sessionStopped(const AsteriskSCF:
         const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
 {
     lg(Debug) << __FUNCTION__ << ": session terminated from " << session->ice_toString() ;
-    session->removeListener(mSessionListenerPrx);
+    session->removeBridge(mSessionListenerPrx);
 
     boost::unique_lock<boost::shared_mutex> lock(mLock);
     std::vector<BridgeSession>::iterator i = find_if(mSessions.begin(), mSessions.end(), AsteriskSCF::BridgeService::FindImpl(session));

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


-- 
asterisk-scf/integration/bridging.git