From 1bbaa4bf33c2877903cd5fb8df3308e5b32e3201 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 18 Jan 2012 13:25:59 +0100 Subject: [PATCH 1/5] Fix linux distcheck --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 04172f7b9..01deec29e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,5 @@ # List of source files containing translatable strings. +gtk/tunnel_config.ui gtk/calllogs.c gtk/conference.c gtk/logging.c From cb07aa080974213844942cbf83d95a785885adce Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 19 Jan 2012 11:04:50 +0100 Subject: [PATCH 2/5] Update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 4aaab3296..31e477267 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 4aaab3296337eb313d9b554dff1860cd23b3dbc9 +Subproject commit 31e477267ec00d07dda1808235e5ae709575d5e5 From 01babfb6807b784f381da40da443bba42effd0da Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 23 Jan 2012 10:10:01 +0100 Subject: [PATCH 3/5] merge patch to enable/disable x11 window at runtime from linphonec --- console/linphonec.c | 3 +++ coreapi/linphonecore.c | 13 +++++++++++++ coreapi/linphonecore.h | 3 +++ mediastreamer2 | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/console/linphonec.c b/console/linphonec.c index e0321089b..7d5c0cdd2 100644 --- a/console/linphonec.c +++ b/console/linphonec.c @@ -966,6 +966,8 @@ static void lpc_apply_video_params(){ #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 } @@ -1265,6 +1267,7 @@ linphonec_parse_cmdline(int argc, char **argv) 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) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 33c168522..7e822699f 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -3608,6 +3608,19 @@ void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long #endif } +/** + * Can be used to disable video showing to free XV port +**/ +void linphone_core_show_video(LinphoneCore *lc, bool_t show){ +#ifdef VIDEO_ENABLED + ms_error("linphone_core_show_video %d", show); + LinphoneCall *call=linphone_core_get_current_call(lc); + if (call!=NULL && call->videostream){ + video_stream_show_video(call->videostream,show); + } +#endif +} + /** * Tells the core to use a separate window for local camera preview video, instead of * inserting local view within the remote video window. diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 14c850de8..a3cd8d3e0 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -952,6 +952,9 @@ void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno); int linphone_core_get_device_rotation(LinphoneCore *lc ); void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation); +/* start or stop streaming video in case of embedded window */ +void linphone_core_show_video(LinphoneCore *lc, bool_t show); + /*play/record support: use files instead of soundcard*/ void linphone_core_use_files(LinphoneCore *lc, bool_t yesno); void linphone_core_set_play_file(LinphoneCore *lc, const char *file); diff --git a/mediastreamer2 b/mediastreamer2 index 31e477267..8e3778f1f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 31e477267ec00d07dda1808235e5ae709575d5e5 +Subproject commit 8e3778f1fd61b44124f7303e540b936f9da4560f From 02607711286be03ac9e074dde0ac02ba03025266 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 23 Jan 2012 12:44:40 +0100 Subject: [PATCH 4/5] fix duplicate route headers in registers --- coreapi/sal_eXosip2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 7a2f3e051..948e67d89 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -2007,6 +2007,8 @@ static void register_set_contact(osip_message_t *msg, const char *contact){ static void sal_register_add_route(osip_message_t *msg, const char *proxy){ char tmp[256]={0}; snprintf(tmp,sizeof(tmp)-1,"<%s;lr>",proxy); + + osip_list_special_free(&msg->routes,(void (*)(void*))osip_route_free); osip_message_set_route(msg,tmp); } From a57932ad3796f72d4fb1b68111447444a7136651 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 24 Jan 2012 17:39:54 +0100 Subject: [PATCH 5/5] fix lookup_known_proxy() to prefer the default proxy if it can do the job (instead of choosing the first matching in the list) --- coreapi/linphonecore.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 7e822699f..d2ef42364 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1966,6 +1966,16 @@ void linphone_core_start_refered_call(LinphoneCore *lc, LinphoneCall *call){ LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const LinphoneAddress *uri){ const MSList *elem; LinphoneProxyConfig *found_cfg=NULL; + LinphoneProxyConfig *default_cfg=lc->default_proxy; + + /*always prefer the default proxy if it is matching the destination uri*/ + if (default_cfg){ + const char *domain=linphone_proxy_config_get_domain(default_cfg); + if (strcmp(domain,linphone_address_get_domain(uri))==0) + return default_cfg; + } + + /*otherwise iterate through the other proxy config and return the first matching*/ for (elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=elem->next){ LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data; const char *domain=linphone_proxy_config_get_domain(cfg);