From c34f6cf62a5abe08a6cfba1aaf6f83a4ce161cba Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Fri, 20 Mar 2015 10:19:12 +0000 Subject: Misc (re #1782): Setup log writer function on pjsua CLI (useful for debugging library initialization). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5005 74dad513-b988-da41-8d7b-12977e46ad98 --- .../src/pjsua/android/jni/pjsua_app_callback.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'pjsip-apps/src') diff --git a/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp b/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp index 6268b55e..f9b0dcee 100644 --- a/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp +++ b/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp @@ -23,6 +23,8 @@ #if defined(PJ_ANDROID) && PJ_ANDROID != 0 +#include + static PjsuaAppCallback* registeredCallbackObject = NULL; static pjsua_app_cfg_t android_app_config; static int restart_argc; @@ -32,8 +34,21 @@ extern const char *pjsua_app_def_argv[]; #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]; if (registeredCallbackObject) { @@ -45,7 +60,7 @@ void on_cli_started(pj_status_t status, const char *msg) } } -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) { restart_argc = argc; @@ -82,6 +97,7 @@ int pjsuaStart() 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; -- cgit v1.2.3