Changeset 4609 for pjproject/trunk/pjsip-apps/src/python/_pjsua.c

Timestamp:

Oct 2, 2013 3:19:54 AM (11 years ago)

Author:

nanang

Message:

Close #1701: added received message info into incoming call callback

File:

• pjproject/trunk/pjsip-apps/src/python/_pjsua.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/python/_pjsua.c

@@ -132 +132 @@
  */
 static void cb_on_incoming_call(pjsua_acc_id acc_id, pjsua_call_id call_id,
-                                pjsip_rx_data *rdata)
-{
-    PJ_UNUSED_ARG(rdata);
-
+                                pjsip_rx_data *rdata)
+{
     if (PyCallable_Check(g_obj_callback->on_incoming_call)) {
-        PyObject *obj;
-
+        PyObj_pjsip_rx_data *obj;
+        
         ENTER_PYTHON();
-
-        obj = Py_BuildValue("");
-
-        PyObject_CallFunction(
-                g_obj_callback->on_incoming_call,
-                "iiO",
-                acc_id,
-                call_id,
-                obj,
-                NULL
-        );
+        
+        obj = (PyObj_pjsip_rx_data*)
+              PyObj_pjsip_rx_data_new(&PyTyp_pjsip_rx_data,
+                                      NULL, NULL);
+        PyObj_pjsip_rx_data_import(obj, rdata);
+
+        PyObject_CallFunction(
+            g_obj_callback->on_incoming_call,
+            "iiO",
+            acc_id,
+            call_id,
+            obj,
+            NULL
+        );
 
         Py_DECREF(obj);
@@ -4454 +4455 @@
     if (PyType_Ready(&PyTyp_pjsip_cred_info) < 0)
         return;
+    PyTyp_pjsip_rx_data.tp_new = PyType_GenericNew;
+    if (PyType_Ready(&PyTyp_pjsip_rx_data) < 0)
+        return;
 
     /* LIB TRANSPORT */
@@ -4536 +4540 @@
     PyModule_AddObject(m, "Pjsip_Cred_Info",
         (PyObject *)&PyTyp_pjsip_cred_info
+    );
+
+    Py_INCREF(&PyTyp_pjsip_rx_data);
+    PyModule_AddObject(m, "Pjsip_Rx_Data",
+        (PyObject *)&PyTyp_pjsip_rx_data
     );