[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  96d470ec32c37b0602c6bb537d86688ed8a1a144 (commit)
      from  a81a3f0d61ebb558cf3f07bead558b8db8955362 (commit)

Summary of changes:
 src/MediaSplicer.cpp |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 96d470ec32c37b0602c6bb537d86688ed8a1a144
Author: Joshua Colp <jcolp at digium.com>
Date:   Sun Jul 10 11:49:58 2011 -0300

    Merge revised media design implementation.

diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index e8abb17..e4992fb 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -254,7 +254,8 @@ public:
             {
                 try
                 {
-                    (*i)->setSink(StreamSinkPrx());
+//                    (*i)->setSink(StreamSinkPrx());
+// TODO: call removeSink
                 }
                 catch (const Ice::Exception& ex)
                 {
@@ -324,7 +325,8 @@ public:
             {
                 try
                 {
-                    (*i)->setSink(StreamSinkPrx());
+//                    (*i)->setSink(StreamSinkPrx());
+// TODO: Call removeSink
                 }
                 catch (const Ice::Exception& ex)
                 {
@@ -790,7 +792,7 @@ protected:
         {
         }
 
-        void setSinkCB()
+        void addSinkCB()
         {
             bool other = false;
             {
@@ -863,7 +865,7 @@ protected:
         for (OutgoingPairings::iterator i = mMaterials->outgoingPairings.begin(); i != mMaterials->outgoingPairings.end(); ++i)
         {
             OutgoingHelperPtr h(new OutgoingHelper(this, index));
-            i->second->begin_setSink(i->first, AsteriskSCF::Media::V1::newCallback_StreamSource_setSink(h, &OutgoingHelper::setSinkCB, &OutgoingHelper::failed));
+            i->second->begin_addSink(i->first, AsteriskSCF::Media::V1::newCallback_StreamSource_addSink(h, &OutgoingHelper::addSinkCB, &OutgoingHelper::failed));
             i->first->begin_setSource(i->second, AsteriskSCF::Media::V1::newCallback_StreamSink_setSource(h, &OutgoingHelper::setSourceCB, &OutgoingHelper::failed));
             ++index;
         }
@@ -871,7 +873,7 @@ protected:
         for (IncomingPairings::iterator i = mMaterials->incomingPairings.begin(); i != mMaterials->incomingPairings.end(); ++i)
         {
             IncomingHelperPtr h(new IncomingHelper(this, index));
-            i->first->begin_setSink(i->second,  AsteriskSCF::Media::V1::newCallback_StreamSource_setSink(h, &IncomingHelper::setSinkCB, &IncomingHelper::failed));
+            i->first->begin_addSink(i->second,  AsteriskSCF::Media::V1::newCallback_StreamSource_addSink(h, &IncomingHelper::addSinkCB, &IncomingHelper::failed));
             i->second->begin_setSource(i->first,  AsteriskSCF::Media::V1::newCallback_StreamSink_setSource(h, &IncomingHelper::setSourceCB, &IncomingHelper::failed));
             ++index;
         }

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


-- 
asterisk-scf/release/bridging.git