[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "indicate" updated.

[Commits to the Asterisk SCF project code repositories]

branch "indicate" has been updated
       via  ab478a5684fed6d71a1169104ff9067a240b1e81 (commit)
      from  dd6f1be516148b8f328adf3f174c43fe949a1b61 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit ab478a5684fed6d71a1169104ff9067a240b1e81
Author: Joshua Colp <jcolp at digium.com>
Date:   Thu Apr 7 10:37:38 2011 -0300

    Use new method to send indications.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 58a30c5..b04d252 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -823,9 +823,9 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
             try
             {
                 ListenerCallbackPtr cb(new ListenerCallback(RingingCallbackName));
-                Callback_SessionListener_ringingPtr ringingCB =
-                    newCallback_SessionListener_ringing(cb, &ListenerCallback::failure);
-                (*listener)->begin_ringing(session->getSessionProxy(), ringingCB);
+                Callback_SessionListener_indicatedPtr ringingCB =
+                    newCallback_SessionListener_indicated(cb, &ListenerCallback::failure);
+                (*listener)->begin_indicated(session->getSessionProxy(), new RingingIndication(), ringingCB);
             }
             catch (const Ice::Exception &ex)
             {
@@ -846,9 +846,11 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
             try
             {
                 ListenerCallbackPtr cb(new ListenerCallback(ProgressingCallbackName));
-                Callback_SessionListener_progressingPtr progressingCB =
-                    newCallback_SessionListener_progressing(cb, &ListenerCallback::failure);
-                (*listener)->begin_progressing(session->getSessionProxy(), response, progressingCB);
+                Callback_SessionListener_indicatedPtr progressingCB =
+                    newCallback_SessionListener_indicated(cb, &ListenerCallback::failure);
+		ProgressingIndicationPtr progressing(new ProgressingIndication());
+		progressing->response = response;
+                (*listener)->begin_indicated(session->getSessionProxy(), progressing, progressingCB);
             }
             catch (const Ice::Exception &ex)
             {
@@ -869,9 +871,9 @@ void PJSipSessionModule::handleInviteResponse(pjsip_inv_session *inv,
                 try
                 {
                     ListenerCallbackPtr cb(new ListenerCallback(ConnectedCallbackName));
-                    Callback_SessionListener_connectedPtr connectedCB =
-                        newCallback_SessionListener_connected(cb, &ListenerCallback::failure);
-                    (*listener)->begin_connected(session->getSessionProxy(), connectedCB);
+                    Callback_SessionListener_indicatedPtr connectedCB =
+                        newCallback_SessionListener_indicated(cb, &ListenerCallback::failure);
+                    (*listener)->begin_indicated(session->getSessionProxy(), new ConnectedIndication(), connectedCB);
                 }
                 catch (const Ice::Exception &ex)
                 {

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


-- 
asterisk-scf/integration/sip.git