From 38d4730be5d172c13d0bd58a53c397c140f81231 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 26 Apr 2012 11:30:50 +0200 Subject: [PATCH 1/7] add missing using namespace::std --- coreapi/TunnelManager.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc index b8f1dae48..3e998cb74 100644 --- a/coreapi/TunnelManager.cc +++ b/coreapi/TunnelManager.cc @@ -25,6 +25,7 @@ using namespace belledonnecomm; +using namespace ::std; Mutex TunnelManager::sMutex; From 0e496ed3d9f19528b0a2db5050c11030ca6a1312 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 26 Apr 2012 15:30:08 +0200 Subject: [PATCH 2/7] zoom: float to float* so the app can know about zoom limits --- coreapi/linphonecore.c | 22 +++++++++++----------- coreapi/linphonecore.h | 2 +- mediastreamer2 | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index a7ccef402..a8440a63d 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4782,7 +4782,7 @@ void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *para params->in_conference=FALSE; } -void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, float cy) { +void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy) { VideoStream* vstream = call->videostream; float zoom[3]; @@ -4790,18 +4790,18 @@ void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, f zoom_factor = 1; float halfsize = 0.5 * 1.0 / zoom_factor; - if ((cx - halfsize) < 0) - cx = 0 + halfsize; - if ((cx + halfsize) > 1) - cx = 1 - halfsize; - if ((cy - halfsize) < 0) - cy = 0 + halfsize; - if ((cy + halfsize) > 1) - cy = 1 - halfsize; + if ((*cx - halfsize) < 0) + *cx = 0 + halfsize; + if ((*cx + halfsize) > 1) + *cx = 1 - halfsize; + if ((*cy - halfsize) < 0) + *cy = 0 + halfsize; + if ((*cy + halfsize) > 1) + *cy = 1 - halfsize; zoom[0] = zoom_factor; - zoom[1] = cx; - zoom[2] = cy; + zoom[1] = *cx; + zoom[2] = *cy; ms_filter_call_method(vstream->output, MS_VIDEO_DISPLAY_ZOOM, &zoom); } diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index d3a514a69..bd10556a0 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1134,7 +1134,7 @@ typedef struct LinphoneTunnel LinphoneTunnel; */ LinphoneTunnel *linphone_core_get_tunnel(LinphoneCore *lc); - void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float cx, float cy); +void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy); #ifdef __cplusplus } diff --git a/mediastreamer2 b/mediastreamer2 index 43c192346..37474c877 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 43c1923468d962aa5577ebcf6d8674ef9d426e40 +Subproject commit 37474c877a7f4e1c458c6f9edf1302e75d929dd1 From 53d5f0c2bf8a5fbbfb04ce4126db81ff3da38916 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 27 Apr 2012 10:24:38 +0200 Subject: [PATCH 3/7] fix login frame --- gtk/loginframe.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk/loginframe.c b/gtk/loginframe.c index f1a67d9d5..7251adf38 100644 --- a/gtk/loginframe.c +++ b/gtk/loginframe.c @@ -62,14 +62,14 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){ int nettype; const char *passwd=NULL; - + if (linphone_core_get_download_bandwidth(lc)==512 && linphone_core_get_upload_bandwidth(lc)==512) nettype=NetworkKindOpticalFiber; else nettype=NetworkKindAdsl; gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"login_internet_kind")),nettype); - gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"internet_kind")),nettype); - + //gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"internet_kind")),nettype); + if (linphone_gtk_get_ui_config_int("automatic_login",0) ){ g_timeout_add(250,(GSourceFunc)do_login_noprompt,cfg); return; @@ -88,7 +88,6 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){ gtk_widget_hide(linphone_gtk_get_widget(mw,"disconnect_item")); gtk_widget_hide(linphone_gtk_get_widget(mw,"main_frame")); gtk_widget_show(linphone_gtk_get_widget(mw,"login_frame")); - gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),FALSE); gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),FALSE); str=g_strdup_printf(_("Please enter login information for %s"),linphone_proxy_config_get_domain(cfg)); gtk_label_set_text(GTK_LABEL(label),str); @@ -118,7 +117,6 @@ void linphone_gtk_exit_login_frame(void){ GtkWidget *mw=linphone_gtk_get_main_window(); gtk_widget_show(linphone_gtk_get_widget(mw,"main_frame")); gtk_widget_hide(linphone_gtk_get_widget(mw,"login_frame")); - gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"main_menu"),TRUE); gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"options_menu"),TRUE); gtk_widget_show(linphone_gtk_get_widget(mw,"disconnect_item")); } From acc0b85683c64c4a808db1eeb8992fdf69118dda Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 27 Apr 2012 16:30:40 +0200 Subject: [PATCH 4/7] Refresh identity after loginframe --- gtk/loginframe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gtk/loginframe.c b/gtk/loginframe.c index 7251adf38..08b90fe45 100644 --- a/gtk/loginframe.c +++ b/gtk/loginframe.c @@ -49,6 +49,7 @@ static gboolean do_login_noprompt(LinphoneProxyConfig *cfg){ tmp=linphone_address_as_string (addr); do_login(ssctx,tmp,NULL); linphone_address_destroy(addr); + linphone_gtk_load_identities(); return FALSE; } From d0ced93c25f088c04a9f92b82aa41c5b1f271e23 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 27 Apr 2012 17:08:36 +0200 Subject: [PATCH 5/7] bugfix with srtp at shutdown --- oRTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oRTP b/oRTP index 41d13b7e4..07fa32444 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 41d13b7e491c7fc418987b63ff6ef80c7e8895a4 +Subproject commit 07fa32444a010965baec9562c9d07da5e5d6f2ce From 504a67b0e74c9d9a23c95e8e38127368c8276804 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 2 May 2012 10:10:20 +0200 Subject: [PATCH 6/7] replace vectors by array lin LinphoneCore.java --- java/common/org/linphone/core/LinphoneCore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java index 31300e384..f33415b46 100644 --- a/java/common/org/linphone/core/LinphoneCore.java +++ b/java/common/org/linphone/core/LinphoneCore.java @@ -409,7 +409,7 @@ public interface LinphoneCore { /** * @return a list of LinphoneCallLog */ - public Vector getCallLogs(); + public LinphoneCallLog[] getCallLogs(); /** * This method is called by the application to notify the Linphone core library when network is reachable. @@ -690,7 +690,7 @@ public interface LinphoneCore { int getConferenceSize(); void terminateAllCalls(); - Vector getCalls(); + LinphoneCall[] getCalls(); int getCallsNb(); From 04fa4d457b3b584eae8c5964a48a97ec4040c94a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 30 Apr 2012 14:34:48 +0200 Subject: [PATCH 7/7] make sure registration with expires=0 is allowed --- coreapi/linphonecore.c | 4 ++-- coreapi/proxy.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index a8440a63d..802afe725 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4393,7 +4393,7 @@ void linphone_core_refresh_registers(LinphoneCore* lc) { elem=linphone_core_get_proxy_config_list(lc); for(;elem!=NULL;elem=elem->next){ LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data; - if (linphone_proxy_config_register_enabled(cfg) ) { + if (linphone_proxy_config_register_enabled(cfg) && linphone_proxy_config_get_expires(cfg)>0) { linphone_proxy_config_refresh_register(cfg); } } @@ -4403,7 +4403,7 @@ void __linphone_core_invalidate_registers(LinphoneCore* lc){ const MSList *elem=linphone_core_get_proxy_config_list(lc); for(;elem!=NULL;elem=elem->next){ LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data; - if (linphone_proxy_config_register_enabled(cfg) ) { + if (linphone_proxy_config_register_enabled(cfg)) { linphone_proxy_config_edit(cfg); linphone_proxy_config_done(cfg); } diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 49e0ec3cc..cf7675807 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -218,7 +218,7 @@ void linphone_proxy_config_enableregister(LinphoneProxyConfig *obj, bool_t val){ * Sets the registration expiration time in seconds. **/ void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int val){ - if (val<=0) val=600; + if (val<0) val=600; obj->expires=val; }