diff options
author | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
commit | 3fb7b207726aa7500b761c7056f7dbf82ac5015d (patch) | |
tree | ca9641fb466f01651cbbd8d619fa6da5fac32976 /pjsip-apps/src/pjsua | |
parent | 49aea0237b6e2134fe31c551f21e8148c884e140 (diff) |
Merge #1050, #1052, #1053, #1054 into the main trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3175 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/pjsua')
-rw-r--r-- | pjsip-apps/src/pjsua/gui.h | 38 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 5 |
2 files changed, 42 insertions, 1 deletions
diff --git a/pjsip-apps/src/pjsua/gui.h b/pjsip-apps/src/pjsua/gui.h new file mode 100644 index 00000000..6a321bf2 --- /dev/null +++ b/pjsip-apps/src/pjsua/gui.h @@ -0,0 +1,38 @@ +/* $Id$ */ +/* + * Copyright (C) 2008-2010 Teluu Inc. (http://www.teluu.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __GUI_H__ +#define __GUI_H__ + +PJ_BEGIN_DECL + +#ifdef USE_GUI + +#define printf showMsg +#define puts(str) showMsg("%s\n", str) +#define fgets getInput + +void showMsg(const char *format, ...); +char * getInput(char *s, int n, FILE *stream); + +#endif + +PJ_END_DECL + + +#endif /* __GUI_H__ */ diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index aed2dd53..29dcea3e 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <pjsua-lib/pjsua.h> +#include "gui.h" #define THIS_FILE "pjsua_app.c" @@ -149,7 +150,8 @@ static void ringback_start(pjsua_call_id call_id); static void ring_start(pjsua_call_id call_id); static void ring_stop(pjsua_call_id call_id); -pj_bool_t app_restart; +pj_bool_t app_restart; +pj_log_func *log_cb = NULL; /***************************************************************************** * Configuration manipulation @@ -4494,6 +4496,7 @@ pj_status_t app_init(int argc, char *argv[]) app_config.cfg.cb.on_nat_detect = &on_nat_detect; app_config.cfg.cb.on_mwi_info = &on_mwi_info; app_config.cfg.cb.on_transport_state = &on_transport_state; + app_config.log_cfg.cb = log_cb; /* Set sound device latency */ if (app_config.capture_lat > 0) |