Changeset 4657 for pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Nov 27, 2013 9:37:32 AM (10 years ago)

Author:

nanang

Message:

Re #1519: Added presence API in pjsua2.

File:

• pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp (modified) (13 diffs)

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

@@ -19 +19 @@
 #include <pjsua2/endpoint.hpp>
 #include <pjsua2/account.hpp>
+#include <pjsua2/presence.hpp>
 #include "util.hpp"
 
@@ -63 +64 @@
     }
 
-    this->stunIgnoreFailure = ua_cfg.stun_ignore_failure;
+    this->stunIgnoreFailure = PJ2BOOL(ua_cfg.stun_ignore_failure);
     this->natTypeInSdp = ua_cfg.nat_type_in_sdp;
-    this->mwiUnsolicitedEnabled = ua_cfg.enable_unsolicited_mwi;
+    this->mwiUnsolicitedEnabled = PJ2BOOL(ua_cfg.enable_unsolicited_mwi);
 }
 
@@ -205 +206 @@
     this->audioFramePtime = mc.audio_frame_ptime;
     this->maxMediaPorts = mc.max_media_ports;
-    this->hasIoqueue = mc.has_ioqueue;
+    this->hasIoqueue = PJ2BOOL(mc.has_ioqueue);
     this->threadCnt = mc.thread_cnt;
     this->quality = mc.quality;
     this->ptime = mc.ptime;
-    this->noVad = mc.no_vad;
+    this->noVad = PJ2BOOL(mc.no_vad);
     this->ilbcMode = mc.ilbc_mode;
     this->txDropPct = mc.tx_drop_pct;
@@ -222 +223 @@
     this->jbMax = mc.jb_max;
     this->sndAutoCloseTime = mc.snd_auto_close_time;
-    this->vidPreviewEnableNative = mc.vid_preview_enable_native;
+    this->vidPreviewEnableNative = PJ2BOOL(mc.vid_preview_enable_native);
 }
 
@@ -362 +363 @@
     } catch (Error &err) {
         // Ignore
+        PJ_UNUSED_ARG(err);
     }
     delete writer;
@@ -412 +414 @@
                         pj_timer_entry *entry)
 {
+    PJ_UNUSED_ARG(timer_heap);
+
     Endpoint &ep = Endpoint::instance();
     UserTimer *ut = (UserTimer*) entry->user_data;
@@ -505 +509 @@
 
     OnRegStartedParam prm;
-    prm.renew = renew;
+    prm.renew = PJ2BOOL(renew);
     acc->onRegStarted(prm);
 }
@@ -536 +540 @@
                                      pjsua_msg_data *msg_data)
 {
+    PJ_UNUSED_ARG(buddy_id);
+    PJ_UNUSED_ARG(srv_pres);
+
     Account *acc = lookupAcc(acc_id, "on_incoming_subscribe()");
     if (!acc) {
@@ -543 +550 @@
 
     OnIncomingSubscribeParam prm;
+    prm.srvPres         = srv_pres;
     prm.fromUri         = pj2Str(*from);
     prm.rdata.fromPj(*rdata);
     prm.code            = *code;
     prm.reason          = pj2Str(*reason);
+    prm.txOption.fromPj(*msg_data);
 
     acc->onIncomingSubscribe(prm);
@@ -553 +562 @@
     acc->tmpReason = prm.reason;
     *reason = str2Pj(acc->tmpReason);
-    // TODO:
-    //  apply msg_data
+    prm.txOption.toPj(*msg_data);
 }
 
@@ -599 +607 @@
                                  pjsua_acc_id acc_id)
 {
+    PJ_UNUSED_ARG(tdata);
+
     OnInstantMessageStatusParam prm;
     prm.userData        = user_data;
@@ -667 +677 @@
 }
 
+void Endpoint::on_buddy_state(pjsua_buddy_id buddy_id)
+{
+    Buddy *buddy = (Buddy*)pjsua_buddy_get_user_data(buddy_id);
+    if (!buddy || !buddy->isValid()) {
+        /* Ignored */
+        return;
+    }
+
+    buddy->onBuddyState();
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -723 +744 @@
     ua_cfg.cb.on_typing2        = &Endpoint::on_typing2;
     ua_cfg.cb.on_mwi_info       = &Endpoint::on_mwi_info;
+    ua_cfg.cb.on_buddy_state    = &Endpoint::on_buddy_state;
 
     /* Init! */