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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  eee61313875db02d8159c74d426bb64a406d9d6b (commit)
       via  8c2c50a7406cacfb529a3e510e953f960035778b (commit)
       via  9f163f823e256bd86b841d924997983b14b840b0 (commit)
      from  eecb7046abd3fcd0dcf069da962004591ae68972 (commit)

Summary of changes:
 src/TestEndpoint.cpp |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit eee61313875db02d8159c74d426bb64a406d9d6b
Merge: eecb704 8c2c50a
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Apr 21 12:11:05 2011 -0300

    Merge branch 'indicate'


commit 8c2c50a7406cacfb529a3e510e953f960035778b
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Apr 7 11:19:52 2011 -0300

    Finish migration to new indicate support.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 5c84d69..5e6569c 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -73,37 +73,41 @@ public:
     //
     void connected()
     {
-        mPublisher->connected(mSession);
+	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::ConnectedIndication());
     }
 
     void flashed()
     {
-        mPublisher->flashed(mSession);
+	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::FlashedIndication());
     }
 
     void held()
     {
-        mPublisher->held(mSession);
+	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::HeldIndication());
     }
 
     void progressing(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
     {
-        mPublisher->progressing(mSession, response);
+	AsteriskSCF::SessionCommunications::V1::ProgressingIndicationPtr progressing(new AsteriskSCF::SessionCommunications::V1::ProgressingIndication());
+        progressing->response = response;
+        mPublisher->indicated(mSession, progressing);
     }
 
     void ringing()
     {
-        mPublisher->ringing(mSession);
+	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::RingingIndication());
     }
 
     void stopped(const AsteriskSCF::SessionCommunications::V1::ResponseCodePtr& response)
     {
-        mPublisher->stopped(mSession, response);
+	AsteriskSCF::SessionCommunications::V1::StoppedIndicationPtr stopped(new AsteriskSCF::SessionCommunications::V1::StoppedIndication());
+	stopped->response = response;
+	mPublisher->indicated(mSession, stopped);
     }
 
     void unheld()
     {
-        mPublisher->unheld(mSession);
+	mPublisher->indicated(mSession, new AsteriskSCF::SessionCommunications::V1::UnheldIndication());
     }
 
     void setProxy(const AsteriskSCF::SessionCommunications::V1::SessionPrx& prx)

commit 9f163f823e256bd86b841d924997983b14b840b0
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Apr 7 10:21:51 2011 -0300

    Add new indicate support.

diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 830bdbf..5c84d69 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -145,6 +145,11 @@ public:
         return mInfo;
     }
 
+    void indicate(const AsteriskSCF::SessionCommunications::V1::IndicationPtr&, const Ice::Current&)
+    {
+	mEndpointManager->log(mId, __FUNCTION__);
+    }
+
     void connect(const Ice::Current&)
     {
         mEndpointManager->log(mId, __FUNCTION__);

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


-- 
asterisk-scf/release/test_channel.git