Changeset 4638 for pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp

Timestamp:

Oct 25, 2013 10:34:38 AM (11 years ago)

Author:

bennylp

Message:

Re #1519: Implementation of Account API, with inheritance approach:

• With small demo app (samples/pjsua2_demo.cpp)
• Endpoint changed to use inheritance approach too
• Simple account registration demo and callback works
• Further tests will be done in high level app (Python GUI?)
• Temporary build setting fixes (Makefile) to allow linking with pjsua2 and libstdc++
• Temporary hacks in Makefile to ignore other build targets to speed up build. This should be fixed during integration.

Issues:

• incomplete Endpoint::on_incoming_subscribe() implementation. There is no Account::presNotify() yet.
• incomplete Endpoint::on_pager2(), on_pager_status2(), to handle call's pager rather than account's pager
• some SWIGTYPE (unknown type by Swig) still unresolved

File:

• pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp (modified) (3 diffs)

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp

@@ -351 +351 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-Account::Account(AccountCallback *param_cb, Token user_data)
-: id(PJSUA_INVALID_ID), cb(param_cb), userData(user_data)
-{
-    cb->setAccount(this);
+Account::Account()
+: id(PJSUA_INVALID_ID)
+{
 }
 
 Account::~Account()
 {
-    delete cb;
+    /* If this instance is deleted, also delete the corresponding account in
+     * PJSUA library.
+     */
+    if (isValid() && pjsua_get_state() < PJSUA_STATE_CLOSING) {
+        PJSUA2_CHECK_EXPR( pjsua_acc_set_user_data(id, NULL) );
+        PJSUA2_CHECK_EXPR( pjsua_acc_del(id) );
+    }
 }
 
@@ -367 +372 @@
     pjsua_acc_config pj_acc_cfg = acc_cfg.toPj();
 
+    pj_acc_cfg.user_data = (void*)this;
     PJSUA2_CHECK_EXPR( pjsua_acc_add(&pj_acc_cfg, make_default, &id) );
 }
@@ -392 +398 @@
 }
 
-int Account::getIndex() const
+int Account::getId() const
 {
     return id;
 }
 
-void Account::setUserData(Token user_data)
-{
-    userData = user_data;
-}
-
-Token Account::getUserData() const
-{
-    return userData;
+Account *Account::lookup(int acc_id)
+{
+    return (Account*)pjsua_acc_get_user_data(acc_id);
 }