Module: sems Branch: master Commit: 2095d95b2255112bead8a843dd9c5cf16f7a2970 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=2095d95b2255112bead8a843dd9c5cf16f7a2970
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Mon Jul 18 19:35:33 2011 +0200 updated py_sems for new AmSession/AmB2BSession API (wip) --- apps/py_sems/PySemsB2ABDialog.cpp | 14 ++++++++++++-- apps/py_sems/PySemsB2ABDialog.h | 5 ++++- apps/py_sems/PySemsB2BDialog.cpp | 4 ++-- apps/py_sems/PySemsB2BDialog.h | 2 +- apps/py_sems/sip/AmSipDialog.sip | 16 +++++++++------- apps/py_sems/sip/PySemsB2ABDialog.sip | 10 ++++------ apps/py_sems/sip/PySemsB2BDialog.sip | 10 ++++------ apps/py_sems/sip/PySemsDialog.sip | 6 +----- 8 files changed, 37 insertions(+), 30 deletions(-) diff --git a/apps/py_sems/PySemsB2ABDialog.cpp b/apps/py_sems/PySemsB2ABDialog.cpp index f6bbf8f..cefa0da 100644 --- a/apps/py_sems/PySemsB2ABDialog.cpp +++ b/apps/py_sems/PySemsB2ABDialog.cpp @@ -28,11 +28,21 @@ PySemsB2ABDialog::~PySemsB2ABDialog() { } -void PySemsB2ABDialog::onSessionStart(const AmSipRequest& req) +void PySemsB2ABDialog::onBeforeDestroy() { + AmB2ABCallerSession::onBeforeDestroy(); +} + +void PySemsB2ABDialog::onEarlySessionStart() { + DBG("PySemsB2ABDialog::onEarlySessionStart\n"); + setInOut(&playlist,&playlist); + AmB2ABCallerSession::onEarlySessionStart(); +} + +void PySemsB2ABDialog::onSessionStart() { DBG("PySemsB2ABDialog::onSessionStart\n"); setInOut(&playlist,&playlist); - AmB2ABCallerSession::onSessionStart(req); + AmB2ABCallerSession::onSessionStart(); } AmB2ABCalleeSession* PySemsB2ABDialog::createCalleeSession() { diff --git a/apps/py_sems/PySemsB2ABDialog.h b/apps/py_sems/PySemsB2ABDialog.h index e3bf744..d01fc24 100644 --- a/apps/py_sems/PySemsB2ABDialog.h +++ b/apps/py_sems/PySemsB2ABDialog.h @@ -37,11 +37,14 @@ class PySemsB2ABDialog : public AmB2ABCallerSession, PySemsB2ABDialog(); virtual ~PySemsB2ABDialog(); - void onSessionStart(const AmSipRequest& req); + void onEarlySessionStart(); + void onSessionStart(); // @see AmEventHandler void process(AmEvent* event); + void onBeforeDestroy(); + AmB2ABCalleeSession* createCalleeSession(); }; diff --git a/apps/py_sems/PySemsB2BDialog.cpp b/apps/py_sems/PySemsB2BDialog.cpp index 956f780..384b37b 100644 --- a/apps/py_sems/PySemsB2BDialog.cpp +++ b/apps/py_sems/PySemsB2BDialog.cpp @@ -30,11 +30,11 @@ PySemsB2BDialog::~PySemsB2BDialog() { } -void PySemsB2BDialog::onSessionStart(const AmSipRequest& req) +void PySemsB2BDialog::onSessionStart() { DBG("PySemsB2BDialog::onSessionStart\n"); setInOut(&playlist,&playlist); - AmB2BCallerSession::onSessionStart(req); + AmB2BCallerSession::onSessionStart(); } void PySemsB2BDialog::process(AmEvent* event) diff --git a/apps/py_sems/PySemsB2BDialog.h b/apps/py_sems/PySemsB2BDialog.h index 450da07..140ec76 100644 --- a/apps/py_sems/PySemsB2BDialog.h +++ b/apps/py_sems/PySemsB2BDialog.h @@ -36,7 +36,7 @@ class PySemsB2BDialog : public AmB2BCallerSession, PySemsB2BDialog(); virtual ~PySemsB2BDialog(); - void onSessionStart(const AmSipRequest& req); + void onSessionStart(); // @see AmEventHandler void process(AmEvent* event); diff --git a/apps/py_sems/sip/AmSipDialog.sip b/apps/py_sems/sip/AmSipDialog.sip index a519bb7..dd9f5b2 100644 --- a/apps/py_sems/sip/AmSipDialog.sip +++ b/apps/py_sems/sip/AmSipDialog.sip @@ -9,11 +9,13 @@ class AmSipDialog public: enum Status { - - Disconnected=0, - Pending, - Connected, - Disconnecting + Disconnected=0, + Trying, + Proceeding, + Cancelling, + Early, + Connected, + Disconnecting }; string user; // local user @@ -40,8 +42,8 @@ public: int getStatus(); string getContactHdr(); - void updateStatus(const AmSipRequest& /* req */); - void updateStatus(const AmSipReply& /* reply */); + void onRxRequest(const AmSipRequest& /* req */); + void onRxReply(const AmSipReply& /* reply */); int reply(const AmSipRequest& /* req */, unsigned int /* code */, diff --git a/apps/py_sems/sip/PySemsB2ABDialog.sip b/apps/py_sems/sip/PySemsB2ABDialog.sip index bbba2c6..29f6926 100644 --- a/apps/py_sems/sip/PySemsB2ABDialog.sip +++ b/apps/py_sems/sip/PySemsB2ABDialog.sip @@ -36,15 +36,13 @@ public: fprintf(stderr,"------------- dealloc_PySemsB2ABDialog ----------\n"); %End - int acceptAudio(const string& /* body */, - const string& /* hdrs */, - string* /Out/ /* sdp_reply */); - void setStopped(); + virtual void onBeforeDestroy(); virtual void onInvite(const AmSipRequest& /* req */); - virtual void onSessionStart(const AmSipRequest& /* req */); - virtual void onCancel(); + virtual void onCancel(const AmSipRequest& /* req */); + virtual void onSessionStart(); + virtual void onEarlySessionStart(); virtual void onBye(const AmSipRequest& /* req */); virtual void onDtmf(int /* event */, int /* duration_msec */); diff --git a/apps/py_sems/sip/PySemsB2BDialog.sip b/apps/py_sems/sip/PySemsB2BDialog.sip index 5f684a6..39e1b31 100644 --- a/apps/py_sems/sip/PySemsB2BDialog.sip +++ b/apps/py_sems/sip/PySemsB2BDialog.sip @@ -17,15 +17,13 @@ public: fprintf(stderr,"------------- dealloc_PySemsB2BDialog ----------\n"); %End - int acceptAudio(const string& /* body */, - const string& /* hdrs */, - string* /Out/ /* sdp_reply */); - void setStopped(); + virtual void onBeforeDestroy(); virtual void onInvite(const AmSipRequest& /* req */); - virtual void onSessionStart(const AmSipRequest& /* req */); - virtual void onCancel(); + virtual void onCancel(const AmSipRequest& /* req */); + virtual void onSessionStart(); + virtual void onEarlySessionStart(); virtual void onBye(const AmSipRequest& /* req */); virtual void onDtmf(int /* event */, int /* duration_msec */); diff --git a/apps/py_sems/sip/PySemsDialog.sip b/apps/py_sems/sip/PySemsDialog.sip index ff1eabd..dca4206 100644 --- a/apps/py_sems/sip/PySemsDialog.sip +++ b/apps/py_sems/sip/PySemsDialog.sip @@ -17,15 +17,11 @@ public: fprintf(stderr,"------------- dealloc_PySemsDialog ----------\n"); %End - int acceptAudio(const string& /* body */, - const string& /* hdrs */, - string* /Out/ /* sdp_reply */); - void setStopped(); virtual void onInvite(const AmSipRequest& /* req */); virtual void onSessionStart(const AmSipRequest& /* req */); - virtual void onCancel(); + virtual void onCancel(const AmSipRequest& /* req */); virtual void onBye(const AmSipRequest& /* req */); virtual void onDtmf(int /* event */, int /* duration_msec */); _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
