Changeset 5005 for pjproject/trunk

Timestamp:

Mar 20, 2015 10:19:12 AM (10 years ago)

Author:

nanang

Message:

Misc (re #1782): Setup log writer function on pjsua CLI (useful for debugging library initialization).

File:

• pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp

@@ -24 +24 @@
 #if defined(PJ_ANDROID) && PJ_ANDROID != 0
 
+#include <android/log.h>
+
 static PjsuaAppCallback* registeredCallbackObject = NULL;
 static pjsua_app_cfg_t android_app_config;
@@ -33 +35 @@
 #define THIS_FILE       "pjsua_app_callback.cpp"
 
+extern "C" {
+static void log_writer(int level, const char *data, int len)
+{
+    __android_log_write(ANDROID_LOG_INFO, "pjsua", data);
+}
+}
+
+
 /** Callback wrapper **/
-void on_cli_started(pj_status_t status, const char *msg)
+static void on_cli_config(pjsua_app_config *cfg)
+{
+    cfg->log_cfg.cb = &log_writer;
+}
+
+static void on_cli_started(pj_status_t status, const char *msg)
 {
     char errmsg[PJ_ERR_MSG_SIZE];
@@ -46 +61 @@
 }
 
-void on_cli_stopped(pj_bool_t restart, int argc, char **argv)
+static void on_cli_stopped(pj_bool_t restart, int argc, char **argv)
 {
     if (restart) {
@@ -83 +98 @@
     pj_bzero(&android_app_config, sizeof(android_app_config));
 
+    android_app_config.on_config_init = &on_cli_config;
     android_app_config.on_started = &on_cli_started;
     android_app_config.on_stopped = &on_cli_stopped;