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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  da5227c2153dd14b0170af103ae4931c21137f20 (commit)
      from  316f13b5878d249809c9d749fb732aef34c0acfb (commit)

Summary of changes:
 src/SessionWrapper.cpp |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit da5227c2153dd14b0170af103ae4931c21137f20
Author: Brent Eagles <beagles at digium.com>
Date:   Thu May 19 18:26:35 2011 -0230

    Remove connection state modifcation from the setupMedia method.

diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
index 80e6490..eab9bcb 100644
--- a/src/SessionWrapper.cpp
+++ b/src/SessionWrapper.cpp
@@ -307,6 +307,7 @@ QueuedTasks createShutdownTasks(const SessionWrapperPtr& session, const SessionL
 QueuedTasks createSetupTasks(const SessionWrapperPtr& session)
 {
     QueuedTasks tasks;
+    tasks.push_back(new SetStateTask(session, Connected));
     tasks.push_back(new ConnectMediaTask(session));
     return tasks;
 }
@@ -400,17 +401,8 @@ SessionPrx SessionWrapper::getSession() const
 void SessionWrapper::setupMedia()
 {
     mLogger(Debug) << FUNLOG << " for " << mId;
-    BridgedSessionPtr stateUpdate;
-    {
-        boost::unique_lock<boost::shared_mutex> lock(mLock);
-        if (mSession->currentState == Added)
-        {
-            mSplicer->connect(this, mSession->session);
-            mSession->currentState = Connected;
-            stateUpdate = createUpdate();
-        }
-    }
-    pushUpdate(stateUpdate);
+    boost::unique_lock<boost::shared_mutex> lock(mLock);
+    mSplicer->connect(this, mSession->session);
 }
 
 void SessionWrapper::setConnector(const MediaConnectorPtr& connector)

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


-- 
asterisk-scf/release/bridging.git