Changeset 4631 for pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp

Timestamp:

Oct 23, 2013 5:34:48 AM (11 years ago)

Author:

bennylp

Message:

More re #1519:

• account API implementation (incomplete, callback is still not called)
• using callback class design pattern (observer?)
• after this, it might be changed to use inheritance pattern instead

File:

• pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp (modified) (11 diffs)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp

@@ -799 +799 @@
 };
 
+
 /**
  * Account information. Application can query the account information
@@ -824 +825 @@
      * (reg_uri is not empty).
      */
-    bool                hasRegistration;
+    bool                regIsConfigured;
 
     /**
@@ -830 +831 @@
      * (has active registration session).
      */
-    bool                isRegistered;
+    bool                regIsActive;
 
     /**
      * An up to date expiration interval for account registration session.
      */
-    int                 expiresSec;
+    int                 regExpiresSec;
 
     /**
@@ -842 +843 @@
      * status code of the registration.
      */
-    pjsip_status_code   status;
+    pjsip_status_code   regStatus;
 
     /**
      * String describing the registration status.
      */
-    string              statusText;
+    string              regStatusText;
 
     /**
@@ -867 +868 @@
     string              onlineStatusText;
 
+public:
+    void fromPj(const pjsua_acc_info &pai);
 };
 
@@ -909 +912 @@
      * SIP status code received.
      */
-    int                 code;
+    pjsip_status_code   code;
 
     /**
@@ -1090 +1093 @@
     /** Virtual destructor */
     virtual ~AccountCallback() {}
+
+    /**
+     * Get the account associated with this callback.
+     */
+    Account *account()
+    { return acc; }
 
     /**
@@ -1191 +1200 @@
     virtual void onMwiInfo(OnMwiInfoParam &prm)
     {}
+
+protected:
+    AccountCallback()
+    : acc(NULL)
+    {}
+
+private:
+    Account *acc;
+
+    /** Set the account. Must only be called by Account class */
+    void setAccount(Account *the_acc)
+    { acc = the_acc; }
+
+    friend class Account;
 };
 
@@ -1210 +1233 @@
 {
 public:
+    /**
+     * Constructor.
+     */
+    Account(AccountCallback *cb, Token user_data);
+
+    /**
+     * Destructor.
+     */
+    ~Account();
+
+    /**
+     * Create the account.
+     *
+     * @param cfg               The account config.
+     * @param make_default      Make this the default account.
+     */
+    void create(const AccountConfig &cfg,
+                bool make_default=false) throw(Error);
+
+    /**
+     * Modify the account to use the specified account configuration.
+     * Depending on the changes, this may cause unregistration or
+     * reregistration on the account.
+     *
+     * @param cfg               New account config to be applied to the account.
+     */
+    void modify(const AccountConfig &acc) throw(Error);
+
     /**
      * Check if this account is still valid.
@@ -1260 +1311 @@
      * @return                  Account info.
      */
-    AccountInfo getInfo() const;
-
-    /**
-     * Modify the account to use the specified account configuration.
-     * Depending on the changes, this may cause unregistration or
-     * reregistration on the account.
-     *
-     * @param cfg               New account config to be applied to the account.
-     */
-    void modify(const AccountConfig &acc) throw(Error);
+    AccountInfo getInfo() const throw(Error);
 
     /**
@@ -1311 +1353 @@
     friend class Endpoint;
 
-    Account();
+private:
+    pjsua_acc_id         id;
+    AccountCallback     *cb;
+    Token                userData;
 };