static int trace_level = 0;
static char *logfile_name = NULL;
static char configfile_name[PATH_MAX];
+static char zrtpsecrets[PATH_MAX];
static const char *factory_configfile_name=NULL;
static char *sip_addr_to_call = NULL; /* for autocall */
static int window_id = 0; /* 0=standalone window, or window id for embedding video */
linphonec_out("Resuming call %i with %s.\n", id, from);
break;
case LinphoneCallStreamsRunning:
- linphonec_out("Media streams established with %s for call %i.\n", from,id);
+ linphonec_out("Media streams established with %s for call %i (%s).\n", from,id,( linphone_call_params_video_enabled( linphone_call_get_current_params(call)) ? "video":"audio"));
break;
case LinphoneCallPausing:
linphonec_out("Pausing call %i with %s.\n", id, from);
#ifndef _WIN32
snprintf(configfile_name, PATH_MAX, "%s/.linphonerc",
getenv("HOME"));
+ snprintf(zrtpsecrets, PATH_MAX, "%s/.linphone-zidcache",
+ getenv("HOME"));
#elif defined(_WIN32_WCE)
strncpy(configfile_name,PACKAGE_DIR "\\linphonerc",PATH_MAX);
mylogfile=fopen(PACKAGE_DIR "\\" "linphonec.log","w");
#else
snprintf(configfile_name, PATH_MAX, "%s/Linphone/linphonerc",
getenv("APPDATA"));
+ snprintf(zrtpsecrets, PATH_MAX, "%s/Linphone/linphone-zidcache",
+ getenv("APPDATA"));
#endif
/* Handle configuration filename changes */
switch (handle_configfile_migration())
* Initialize linphone core
*/
linphonec=linphone_core_new (&linphonec_vtable, configfile_name, factory_configfile_name, NULL);
+ linphone_core_set_zrtp_secrets_file(linphonec,zrtpsecrets);
linphone_core_enable_video(linphonec,vcap_enabled,display_enabled);
if (display_enabled && window_id != 0)
{
void
print_usage (int exit_status)
{
- fprintf (stdout, "\n\
-usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n\
- linphonec -v\n\
-\n\
- -b file specify path of readonly factory configuration file.\n\
- -c file specify path of configuration file.\n\
- -d level be verbose. 0 is no output. 6 is all output\n\
- -l logfile specify the log file for your SIP phone\n\
- -s sipaddress specify the sip call to do at startup\n\
- -a enable auto answering for incoming calls\n\
- -V enable video features globally (disabled by default)\n\
- -C enable video capture only (disabled by default)\n\
- -D enable video display only (disabled by default)\n\
- -S show general state messages (disabled by default)\n\
- --wid windowid force embedding of video window into provided windowid (disabled by default)\n\
- -v or --version display version and exits.\n");
+ fprintf (stdout, "\n"
+"usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n"
+ "linphonec -v\n"
+"\n"
+" -b file specify path of readonly factory configuration file.\n"
+" -c file specify path of configuration file.\n"
+" -d level be verbose. 0 is no output. 6 is all output\n"
+" -l logfile specify the log file for your SIP phone\n"
+" -s sipaddress specify the sip call to do at startup\n"
+" -a enable auto answering for incoming calls\n"
+" -V enable video features globally (disabled by default)\n"
+" -C enable video capture only (disabled by default)\n"
+" -D enable video display only (disabled by default)\n"
+" -S show general state messages (disabled by default)\n"
+" --wid windowid force embedding of video window into provided windowid (disabled by default)\n"
+" -v or --version display version and exits.\n");
exit(exit_status);
}
#ifdef HAVE_X11_XLIB_H
if (lpc_video_params.wid==0){ // do not manage window if embedded
x11_apply_video_params(&lpc_video_params,wid);
+ } else {
+ linphone_core_show_video(linphonec, lpc_video_params.show);
}
#endif
}
if (arg_num < argc) {
char *tmp;
window_id = strtol( argv[arg_num], &tmp, 0 );
+ lpc_video_params.wid = window_id;
}
}
else if (old_arg_num == arg_num)