Changeset 5672 for pjproject

Timestamp:

Oct 6, 2017 8:14:31 AM (7 years ago)

Author:

riza

Message:

Close #2051: Implement callback wrapper for on_buddy_evsub_state() on pjsua2.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/endpoint.hpp (modified) (1 diff)
• include/pjsua2/presence.hpp (modified) (2 diffs)
• src/pjsua2/endpoint.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -1652 +1652 @@
                                          pjsua_acc_id* acc_id);
     static void on_buddy_state(pjsua_buddy_id buddy_id);
+    static void on_buddy_evsub_state(pjsua_buddy_id buddy_id,
+                                     pjsip_evsub *sub,
+                                     pjsip_event *event);
     // Call callbacks
     static void on_call_state(pjsua_call_id call_id, pjsip_event *e);

pjproject/trunk/pjsip/include/pjsua2/presence.hpp

@@ -177 +177 @@
 
 /**
+ * This structure contains parameters for Buddy::onBuddyEvSubState() callback.
+ */
+struct OnBuddyEvSubStateParam
+{
+    /**
+     * * The event which triggers state change event.
+     */
+    SipEvent    e;
+};
+
+
+/**
  * Buddy.
  */
@@ -270 +282 @@
     virtual void onBuddyState()
     {}
+
+    /**
+     * Notify application when the state of client subscription session
+     * associated with a buddy has changed. Application may use this
+     * callback to retrieve more detailed information about the state
+     * changed event.
+     *
+     * @param prm       Callback parameter.
+     */
+    virtual void onBuddyEvSubState(OnBuddyEvSubStateParam &prm)
+    { PJ_UNUSED_ARG(prm); }
      
 private:

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -972 +972 @@
 
     buddy->onBuddyState();
+}
+
+void Endpoint::on_buddy_evsub_state(pjsua_buddy_id buddy_id,
+                                    pjsip_evsub *sub,
+                                    pjsip_event *event)
+{
+    PJ_UNUSED_ARG(sub);
+
+    Buddy *buddy = (Buddy*)pjsua_buddy_get_user_data(buddy_id);
+    if (!buddy || !buddy->isValid()) {
+        /* Ignored */
+        return;
+    }
+
+    OnBuddyEvSubStateParam prm;
+    prm.e.fromPj(*event);
+
+    buddy->onBuddyEvSubState(prm);
 }
 
@@ -1531 +1549 @@
     ua_cfg.cb.on_mwi_info       = &Endpoint::on_mwi_info;
     ua_cfg.cb.on_buddy_state    = &Endpoint::on_buddy_state;
+    ua_cfg.cb.on_buddy_evsub_state = &Endpoint::on_buddy_evsub_state;
     ua_cfg.cb.on_acc_find_for_incoming  = &Endpoint::on_acc_find_for_incoming;
     ua_cfg.cb.on_ip_change_progress     = &Endpoint::on_ip_change_progress;