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

[Commits to the Asterisk SCF project code repositories]

branch "async-bridging" has been updated
       via  8e4307b30bbdd4410356f9fe816d6f59d60b7740 (commit)
      from  ad57a91c9217d58a24fd2a40fa36f9dbeb6424ae (commit)

Summary of changes:
 src/BridgeManagerImpl.cpp |   16 ++++++++--------
 src/DebugUtil.h           |   18 +++++++++---------
 src/MediaSplicer.cpp      |    2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)


- Log -----------------------------------------------------------------
commit 8e4307b30bbdd4410356f9fe816d6f59d60b7740
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Mar 18 17:39:27 2011 -0230

    Fix build warnings on Windows.

diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 7d90ed5..2269c0a 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -156,7 +156,7 @@ BridgeManagerImpl::BridgeManagerImpl(const Ice::ObjectAdapterPtr& adapter, const
 {
     mLogger(Info) << "Created AsteriskSCF Session-Oriented Bridge Manager." ;
     mListeners = new BridgeManagerListenerMgr(mAdapter->getCommunicator(), mName, mSourceProxy);
-    mState->runningState = ServiceState::Running;
+    mState->runningState = Running;
     mState->key = name;
     mState->serial = SerialCounterStart;
 }
@@ -337,12 +337,12 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
 {
     mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current); 
     boost::unique_lock<boost::shared_mutex> lock(mLock);
-    if (mState->runningState == ServiceState::ShuttingDown)
+    if (mState->runningState == AsteriskSCF::Bridge::V1::ShuttingDown)
     {
         mLogger(Debug) << FUNLOG << ": already shutting down.";
         return;
     }
-    if (mState->runningState == ServiceState::Paused || mListeners->isSuspended())
+    if (mState->runningState == Paused || mListeners->isSuspended())
     {
         mLogger(Debug) << FUNLOG << ": called when suspended." ;
         throw AsteriskSCF::System::Component::V1::Suspended();
@@ -352,7 +352,7 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
         mListeners->stopping();
     }
     mLogger(Info) << current.adapter->getCommunicator()->identityToString(current.id) << ": shutting down." ;
-    mState->runningState = ServiceState::ShuttingDown;
+    mState->runningState = AsteriskSCF::Bridge::V1::ShuttingDown;
     reap();
     if (mBridges.size() > 0)
     {
@@ -364,13 +364,13 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
         mListeners->stopped();
     }
     mAdapter->getCommunicator()->shutdown();
-    mState->runningState = ServiceState::Destroyed;
+    mState->runningState = AsteriskSCF::Bridge::V1::Destroyed;
 }
 
 bool BridgeManagerImpl::destroyed()
 {
     mLogger(Debug) << FUNLOG;
-    return mState->runningState == ServiceState::Destroyed;
+    return mState->runningState == AsteriskSCF::Bridge::V1::Destroyed;
 }
 
 BridgeManagerStateItemPtr BridgeManagerImpl::getState()
@@ -471,12 +471,12 @@ void BridgeManagerImpl::statePreCheck(const string& caller)
     {
         mLogger(Info) << caller << ": remote call invoked when not active!";
     }
-    if (mState->runningState == ServiceState::ShuttingDown)
+    if (mState->runningState == AsteriskSCF::Bridge::V1::ShuttingDown)
     {
         mLogger(Debug) << caller << ": called when shutting down." ;
         throw AsteriskSCF::System::Component::V1::ShuttingDown();
     }
-    if (mState->runningState == ServiceState::Paused || mListeners->isSuspended())
+    if (mState->runningState == AsteriskSCF::Bridge::V1::Paused || mListeners->isSuspended())
     {
         mLogger(Debug) << caller << ": called when suspended." ;
         throw AsteriskSCF::System::Component::V1::Suspended();
diff --git a/src/DebugUtil.h b/src/DebugUtil.h
index ba06db1..fb1a500 100644
--- a/src/DebugUtil.h
+++ b/src/DebugUtil.h
@@ -42,13 +42,13 @@ std::ostream& dumpState(std::ostream& os, const std::string& prefix,
     os << prefix   << "State: ";
     switch (session->currentState)
     {
-        case AsteriskSCF::Bridge::V1::BridgedSessionState::Added:
+        case AsteriskSCF::Bridge::V1::Added:
             os << "added\n";
             break;
-        case AsteriskSCF::Bridge::V1::BridgedSessionState::Connected:
+        case AsteriskSCF::Bridge::V1::Connected:
             os << "connected\n";
             break;
-        case AsteriskSCF::Bridge::V1::BridgedSessionState::Disconnected:
+        case AsteriskSCF::Bridge::V1::Disconnected:
             os << "disconnected\n";
             break;
         default:
@@ -77,16 +77,16 @@ std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Bridge::V1::BridgeS
     os << "state : ";
     switch (state->runningState)
     {
-        case AsteriskSCF::Bridge::V1::ServiceState::Running:
+        case AsteriskSCF::Bridge::V1::Running:
             os << "running\n";
             break;
-        case AsteriskSCF::Bridge::V1::ServiceState::Paused:
+        case AsteriskSCF::Bridge::V1::Paused:
             os << "paused\n";
             break;
-        case AsteriskSCF::Bridge::V1::ServiceState::ShuttingDown:
+        case AsteriskSCF::Bridge::V1::ShuttingDown:
             os << "shutting down\n";
             break;
-        case AsteriskSCF::Bridge::V1::ServiceState::Destroyed:
+        case AsteriskSCF::Bridge::V1::Destroyed:
             os << "destroyed\n";
             break;
         default:
@@ -95,10 +95,10 @@ std::ostream& dumpState(std::ostream& os, const AsteriskSCF::Bridge::V1::BridgeS
     os << "Media replication policy: ";
     switch (state->mediaReplicationPolicy)
     {
-        case AsteriskSCF::Bridge::V1::MediaOperationReplicationPolicy::Replicate:
+        case AsteriskSCF::Bridge::V1::Replicate:
             os << "replicate\n";
             break;
-        case AsteriskSCF::Bridge::V1::MediaOperationReplicationPolicy::Reconstruct:
+        case AsteriskSCF::Bridge::V1::Reconstruct:
             os << "reconstruct\n";
             break;
         default:
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 619d5c7..b1c36a6 100644
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -419,7 +419,7 @@ private:
     string mBridgeId;
     string mSessionId;
     string mKey;
-    long mRepCounter;
+    Ice::Long mRepCounter;
     ReplicatorSmartPrx mReplicator;
     Logger mLogger;
 };

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


-- 
asterisk-scf/integration/bridging.git