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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  10268a5096f6979e9f2ddd0cf0b93a0a221bebe6 (commit)
      from  735d80bc996b104beead3908121d426427e180c8 (commit)

Summary of changes:
 test/TestBridging.cpp |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)


- Log -----------------------------------------------------------------
commit 10268a5096f6979e9f2ddd0cf0b93a0a221bebe6
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Aug 24 12:54:52 2010 -0230

    Fix some search and replace snafus that showed up after some extra test additions.

diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 8f0cdad..79c63de 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -29,18 +29,14 @@ public:
     {
     }
 
-    void write(const Hydra::Media::V1::FrameSeq& frames, const Ice::Current&)
-    {
-    }
-
-    void setSource(const Hydra::Media::V1::StreamSourcePrx source, const Ice::Current&)
+    void setSink(const Hydra::Media::V1::StreamSinkPrx& sink, const Ice::Current&)
     {
-        mSource = source;
+        mSink = sink;
     }
 
-    Hydra::Media::V1::StreamSourcePrx getSource(const Ice::Current&)
+    Hydra::Media::V1::StreamSinkPrx getSink(const Ice::Current&)
     {
-        return mSource;
+        return mSink;
     }
 
     Hydra::Media::V1::FormatSeq getFormats(const Ice::Current&)
@@ -59,7 +55,7 @@ public:
     }
 
 private:
-    Hydra::Media::V1::StreamSourcePrx mSource;
+    Hydra::Media::V1::StreamSinkPrx mSink;
     Hydra::Media::V1::FormatSeq mFormats;
 
     std::string mId;
@@ -74,14 +70,18 @@ public:
     {
     }
 
-    void setSink(const Hydra::Media::V1::StreamSinkPrx destination, const Ice::Current&)
+    void write(const Hydra::Media::V1::FrameSeq& frames, const Ice::Current&)
     {
-        mSink = destination;
     }
 
-    Hydra::Media::V1::StreamSinkPrx getSink(const Ice::Current&)
+    void setSource(const Hydra::Media::V1::StreamSourcePrx& source, const Ice::Current&)
     {
-        return mSink;
+        mSource = source;
+    }
+
+    Hydra::Media::V1::StreamSourcePrx getSource(const Ice::Current&)
+    {
+        return mSource;
     }
 
     Hydra::Media::V1::FormatSeq getFormats(const Ice::Current&)
@@ -100,7 +100,7 @@ public:
     }
 
 private:
-    Hydra::Media::V1::StreamSinkPrx mSink;
+    Hydra::Media::V1::StreamSourcePrx mSource;
     Hydra::Media::V1::FormatSeq mFormats;
 
     std::string mId;
@@ -110,9 +110,13 @@ class SessionI : public Hydra::Media::V1::Session
 {
 public:
 
-    SessionI(const std::string& id) :
+    SessionI(const std::string& id, const Ice::ObjectAdapterPtr& adapter) :
         mId(id)
     {
+        mSources.push_back(Hydra::Media::V1::StreamSourcePrx::uncheckedCast(
+              adapter->addWithUUID(new SourceI(mId + "Source"))));
+        mSinks.push_back(Hydra::Media::V1::StreamSinkPrx::uncheckedCast(
+              adapter->addWithUUID(new SinkI(mId + "Sink"))));
     }
 
     Hydra::Media::V1::StreamSourceSeq getSources(const Ice::Current&)
@@ -201,7 +205,7 @@ typedef IceUtil::Handle<SessionI> SessionIPtr;
 
 static Hydra::Media::V1::SessionPrx createTestSession(const Ice::ObjectAdapterPtr& p, const std::string& id)
 {
-    SessionIPtr session = new SessionI(id);
+    SessionIPtr session = new SessionI(id, p);
     return Hydra::Media::V1::SessionPrx::uncheckedCast(p->addWithUUID(session));
 }
 

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


-- 
asterisk-scf/integration/bridging.git