Changeset 4566 for pjproject/branches/projects/jni/pjsip-apps/src/jni/callbacks.i

Timestamp:

Jul 17, 2013 8:20:50 PM (11 years ago)

Author:

nanang

Message:

JNI projects:

• More work on callbacks wrapper, i.e: pj_timer_heap_callback for pjsua_schedule_timer() and pjsua_logging_config::cb.
• Map pjsua_call_dump() output buffer.

File:

• pjproject/branches/projects/jni/pjsip-apps/src/jni/callbacks.i (modified) (1 diff)

pjproject/branches/projects/jni/pjsip-apps/src/jni/callbacks.i

@@ -5 +5 @@
 %}
 
+/*
+ * Wrap pjsua_logging_config callback
+ */
+%feature("director") PjsuaLoggingConfigCallback;
+%ignore pjsua_logging_config::cb;
+%extend pjsua_logging_config {
+    void setCb(PjsuaLoggingConfigCallback* callback) {
+        setPjsuaLoggingConfigCallback(callback);
+        $self->cb = callback? &pjsua_logging_config_callback_proxy : NULL;
+    }
+}
+
+
+/*
+ * Wrap pj_timer_heap_callback in pj_timer_entry
+ */
+%feature("director") PjTimerHeapCallback;
+%ignore pj_timer_entry::cb;
+/* Suppress user_data, app can put user data in PjTimerHeapCallback inherited class */
+%ignore pj_timer_entry::user_data;
+%extend pj_timer_entry {
+    void setCb(PjTimerHeapCallback* callback) {
+        setPjTimerHeapCallback($self, callback);
+        $self->cb = callback? &pj_timer_heap_callback_proxy : NULL;
+    }
+}
+
+
+/*
+ * Wrap pjsua_callback
+ */
 %feature("director") PjsuaCallback;
 %ignore pjsua_callback;
 %ignore pjsua_config::cb;
 %extend pjsua_config {
-    void setCb(PjsuaCallback *pjsuaCb) {
-        $self->cb = *PJSUA_CALLBACK_PROXY;
-        setPjsuaCallback(pjsuaCb);
+    void setCb(PjsuaCallback *callback) {
+        setPjsuaCallback(callback);
+        if (callback)
+            $self->cb = *pjsua_callback_proxy;
+        else
+            pj_bzero(&$self->cb, sizeof($self->cb));
     }
 }
 
+
 %include <callbacks.h>
+
+/* Ignore these callbacks */
+%ignore pjsip_msg_body::print_body;
+%ignore pjsip_msg_body::clone_data;
+%ignore pjsip_tx_data::cb;
+%ignore pjsip_transaction::state_handler;