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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  057918e0d6131a29856e98ff57723a90af11bd40 (commit)
      from  58584bca51cd9a15f837713e8365b5010478f1f2 (commit)

Summary of changes:
 src/MediaOperationFactoryImpl.h     |    5 -----
 src/MediaOperationStateReplicator.h |    7 +++++++
 src/ulaw_alaw.cpp                   |    4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 057918e0d6131a29856e98ff57723a90af11bd40
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Aug 24 13:49:45 2011 -0500

    Make suggested changes by Brent on CR-ASTSCF-150.

diff --git a/src/MediaOperationFactoryImpl.h b/src/MediaOperationFactoryImpl.h
index e37b9d0..caa8f43 100644
--- a/src/MediaOperationFactoryImpl.h
+++ b/src/MediaOperationFactoryImpl.h
@@ -37,11 +37,6 @@ public:
             const MediaOperationReplicationContextPtr&,
             const std::string&);
 
-    virtual AsteriskSCF::Media::V1::MediaOperationPrx createMediaOperation(
-            const AsteriskSCF::Media::V1::StreamSourcePrx& source,
-            const AsteriskSCF::Media::V1::StreamSinkPrx& sink,
-            const Ice::Current&) = 0;
-
     const std::string& getName();
 
     AsteriskSCF::Media::V1::MediaOperationServiceLocatorParamsPtr getLocatorParams();
diff --git a/src/MediaOperationStateReplicator.h b/src/MediaOperationStateReplicator.h
index c802f28..f8485d8 100644
--- a/src/MediaOperationStateReplicator.h
+++ b/src/MediaOperationStateReplicator.h
@@ -40,6 +40,13 @@ public:
     void stateRemovedForItems(const AsteriskSCF::Replication::MediaOperationsCore::V1::MediaOperationStateItemSeq&, const Ice::Current&);
     void stateSet(const AsteriskSCF::Replication::MediaOperationsCore::V1::MediaOperationStateItemSeq&, const Ice::Current&);
 private:
+    /**
+     * Note this is the "service" object adapter, and not the "backplane"
+     * adapter used for state replication.
+     *
+     * We need this adapter in the state replication listener so that
+     * services can be added and removed as appropriate.
+     */
     Ice::ObjectAdapterPtr mAdapter;
 };
 
diff --git a/src/ulaw_alaw.cpp b/src/ulaw_alaw.cpp
index b27bf7a..6650707 100644
--- a/src/ulaw_alaw.cpp
+++ b/src/ulaw_alaw.cpp
@@ -271,10 +271,12 @@ MediaOperationPrx UlawAlawFactory::createMediaOperation(
         if ((ulaw = G711uLAWPtr::dynamicCast(*sourceIter)))
         {
             sourceUlaw = ulaw;
+            break;
         }
         else if ((alaw = G711aLAWPtr::dynamicCast(*sourceIter)))
         {
             sourceAlaw = alaw;
+            break;
         }
     }
 
@@ -286,10 +288,12 @@ MediaOperationPrx UlawAlawFactory::createMediaOperation(
         if ((ulaw = G711uLAWPtr::dynamicCast(*sinkIter)))
         {
             sinkUlaw = ulaw;
+            break;
         }
         else if ((alaw = G711aLAWPtr::dynamicCast(*sinkIter)))
         {
             sinkAlaw = alaw;
+            break;
         }
     }
 

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


-- 
asterisk-scf/release/media_operations_core.git