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

Timestamp:

Dec 4, 2013 2:38:20 AM (10 years ago)

Author:

nanang

Message:

Misc update & fix:

• added new files (call & media) to VS2005 project
• fixed compile warnings
• fixed compile error when video is disabled
• fixed Makefile when JAVA_HOME env var is set

File:

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

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

@@ -19 +19 @@
 #include <pjsua2/endpoint.hpp>
 #include <pjsua2/account.hpp>
+#include <pjsua2/call.hpp>
 #include <pjsua2/presence.hpp>
 #include <algorithm>
@@ -487 +488 @@
 }
 
+Call *Endpoint::lookupCall(int call_id, const char *op)
+{
+    Call *call = Call::lookup(call_id);
+    if (!call) {
+        PJ_LOG(1,(THIS_FILE,
+                  "Error: cannot find Call instance for call id %d in "
+                  "%s", call_id, op));
+    }
+
+    return call;
+}
+
 void Endpoint::on_incoming_call(pjsua_acc_id acc_id, pjsua_call_id call_id,
                                 pjsip_rx_data *rdata)
@@ -596 +609 @@
 
     if (call_id != PJSUA_INVALID_ID) {
-        // TODO:
-        //      handle call pager
-        return;
+        Call *call = lookupCall(call_id, "on_pager2()");
+        if (!call) {
+            /* Ignored */
+            return;
+        }
+
+        call->onInstantMessage(prm);
     } else {
         Account *acc = lookupAcc(acc_id, "on_pager2()");
@@ -632 +649 @@
 
     if (call_id != PJSUA_INVALID_ID) {
-        // TODO:
-        //      handle call pager
+        Call *call = lookupCall(call_id, "on_pager_status2()");
+        if (!call) {
+            /* Ignored */
+            return;
+        }
+
+        call->onInstantMessageStatus(prm);
     } else {
         Account *acc = lookupAcc(acc_id, "on_pager_status2()");
@@ -661 +683 @@
 
     if (call_id != PJSUA_INVALID_ID) {
-        // TODO:
-        //      handle call indication
+        Call *call = lookupCall(call_id, "on_typing2()");
+        if (!call) {
+            /* Ignored */
+            return;
+        }
+
+        call->onTypingIndication(prm);
     } else {
         Account *acc = lookupAcc(acc_id, "on_typing2()");
@@ -722 +749 @@
                                  pjsip_event *e)
 {
+    PJ_UNUSED_ARG(tsx);
+
     Call *call = Call::lookup(call_id);
     if (!call) {
@@ -858 +887 @@
     prm.statusCode = (pjsip_status_code)st_code;
     prm.reason = pj2Str(*st_text);
-    prm.finalNotify = final;
-    prm.cont = *p_cont;
+    prm.finalNotify = PJ2BOOL(final);
+    prm.cont = PJ2BOOL(*p_cont);
     
     call->onCallTransferStatus(prm);
@@ -910 +939 @@
                                 pjsua_call_setting *opt)
 {
+    PJ_UNUSED_ARG(reserved);
+
     Call *call = Call::lookup(call_id);
     if (!call) {