From a0bf029785638361f1a80be4e2d50bcfe29e5eda Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 4 May 2012 09:48:52 +0200 Subject: [PATCH 1/8] update ms2 for fixing make distcheck --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 13818e851..382bc1036 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 13818e851af2f51b3f0fe7bcec64931038a3d9f3 +Subproject commit 382bc1036d37e7339813a3c5796d88beea1211f5 From cac68c720a8154846e399d28876f4f57ff5e91f2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 7 May 2012 22:16:26 +0200 Subject: [PATCH 2/8] update ms2 for android bugfix --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 382bc1036..f08143a15 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 382bc1036d37e7339813a3c5796d88beea1211f5 +Subproject commit f08143a159df482c84e71307071da6655910ad4d From d50242268651df5852d89fe47fdab82733804676 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 9 May 2012 12:15:22 +0200 Subject: [PATCH 3/8] oRTP updated --- oRTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oRTP b/oRTP index 5e7a3b571..a73a8924e 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 5e7a3b571a073cab29e52634c11f780d7008e0e8 +Subproject commit a73a8924e1f686fe73990c77d6ff92b6a05151fe From 9ca8f73d0b02a92412b9de27f0c09635c9585fa5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 10 May 2012 17:19:51 +0200 Subject: [PATCH 4/8] update ms2 and ortp --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index f08143a15..8f038bf38 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f08143a159df482c84e71307071da6655910ad4d +Subproject commit 8f038bf38022e1a7c13b88f5b00c1d1ba3ef2386 diff --git a/oRTP b/oRTP index a73a8924e..21b8cec3b 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit a73a8924e1f686fe73990c77d6ff92b6a05151fe +Subproject commit 21b8cec3b70108f54d8550db26db01629777d62d From c1bc179ba7bd1c4a655d98d560c01167bb8f08b9 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 15 May 2012 11:05:13 +0200 Subject: [PATCH 5/8] Refresh registrations button (need activation) In .linphonerc add in [GtkUi] section: shown_widgets=main_window.proxy_refresh_button --- gtk/main.c | 12 + gtk/main.ui | 2559 +++++++++++++++++++++++---------------------------- 2 files changed, 1180 insertions(+), 1391 deletions(-) diff --git a/gtk/main.c b/gtk/main.c index b7ef5869f..fc8a6bfcc 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -806,6 +806,18 @@ void linphone_gtk_used_identity_changed(GtkWidget *w){ if (sel) g_free(sel); } + +void on_proxy_refresh_button_clicked(GtkWidget *w){ + LinphoneCore *lc=linphone_gtk_get_core(); + MSList const *item=linphone_core_get_proxy_config_list(lc); + while (item != NULL) { + LinphoneProxyConfig *lpc=(LinphoneProxyConfig*)item->data; + linphone_proxy_config_edit(lpc); + linphone_proxy_config_done(lpc); + item = item->next; + } +} + static void linphone_gtk_notify_recv(LinphoneCore *lc, LinphoneFriend * fid){ linphone_gtk_show_friends(); } diff --git a/gtk/main.ui b/gtk/main.ui index eebb05e75..9a458dbc0 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -1,48 +1,27 @@ - + + - False True - False 0 none True - False 12 True - False True - False - - - True - False - <b>Callee name</b> - True - right - end - - - True - True - end - 0 - - True True - False False @@ -50,10 +29,21 @@ 1 + + + True + <b>Callee name</b> + True + right + end + + + end + 0 + + - True - True 0 @@ -62,7 +52,6 @@ 170 30 True - False False @@ -82,26 +71,21 @@ - False - False 0.5 none True - False 12 12 True - False True - False @@ -115,23 +99,18 @@ True - False label center - True - True 1 - False True - False gtk-dialog-authentication 1 @@ -144,7 +123,6 @@ True - False gtk-apply @@ -156,12 +134,9 @@ True - False label - True - True 2 @@ -171,8 +146,7 @@ True True True - False - + False @@ -189,17 +163,14 @@ - False True True - False half - + - True False 0 @@ -207,7 +178,6 @@ True - False False @@ -218,12 +188,10 @@ True - False gtk-missing-image 1 - True False 2 @@ -231,7 +199,6 @@ True - False False @@ -249,7 +216,6 @@ - False spread @@ -257,8 +223,7 @@ True True True - False - + False @@ -272,8 +237,7 @@ True True True - False - + False @@ -291,7 +255,6 @@ True - False True spread @@ -299,8 +262,7 @@ Pause True True - False - + False @@ -314,11 +276,10 @@ True True True - False False - True + False 1 @@ -336,44 +297,34 @@ True - False True True - False In call True center - True - True 0 True - False Duration center - True - True 1 True - False Call quality rating - True - True 2 @@ -384,1373 +335,52 @@ True - False gtk-info True - False gtk-add True - False gtk-clear True - False gtk-connect True - False gtk-refresh True - False gtk-properties True - False gtk-home True - False gtk-execute True - False gtk-add True - False gtk-add True - False gtk-add True - False gtk-add - - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - False - - - True - False - False - _Options - True - - - - True - False - - - gtk-preferences - True - False - False - True - True - - - - - - gtk-disconnect - False - False - True - True - - - - - - True - False - - - - - True - False - False - Always start video - True - - - - - - True - False - False - Enable self-view - True - True - - - - - - True - False - False - - - - - gtk-quit - False - False - True - True - - - - - - - - - - True - False - False - _Help - True - - - True - False - - - gtk-about - True - False - False - True - True - - - - - - Show debug window - True - False - False - image1 - False - - - - - - _Homepage - True - False - False - True - image4 - False - - - - - - Check _Updates - False - False - True - image5 - False - - - - - - Account assistant - False - False - image12 - False - - - - - - - - - - False - True - 0 - - - - - True - False - - - True - False - - - True - False - - - True - True - True - False - - - - False - False - 0 - - - - - True - True - Initiate a new call - False - - - - False - False - 1 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 5 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - True - Enter username, phone number, or full sip address - ● - False - False - - - - True - True - 0 - - - - - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - SIP address or phone number: - True - - - - - True - True - 2 - - - - - True - True - True - False - - - - False - False - 3 - - - - - False - True - 8 - 0 - - - - - True - True - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - False - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Lookup: - - - True - True - 12 - 0 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● - True - False - False - - - - True - True - 4 - 1 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - in - - - True - True - 8 - 2 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - model1 - 0 - - - - - 0 - - - - - True - True - 4 - 3 - - - - - False - True - 0 - - - - - True - True - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - 0 - - - - - - - - - - - - True - True - 1 - - - - - False - 0 - none - - - False - - - True - True - ● - True - False - False - - - - - - - True - True - 0 - - - - - True - True - True - False - none - - - - True - False - - - True - False - gtk-find - - - True - True - 0 - - - - - True - False - Search - - - True - True - 1 - - - - - - - False - True - 1 - - - - - - - True - False - <b>Add contacts from directory</b> - True - - - - - False - False - 5 - 2 - - - - - True - False - - - Add contact - True - True - False - image10 - - - - False - False - 0 - - - - - False - False - 3 - - - - - True - True - 0 - - - - - - - True - False - - - True - False - gtk-directory - 1 - - - True - True - 0 - - - - - True - False - Contacts - - - True - True - 1 - - - - - False - - - - - True - False - - - True - False - 2 - - - True - False - end - - - gtk-clear - True - True - True - False - True - - - - False - False - 0 - - - - - - - - - - - False - True - end - 0 - - - - - True - True - never - - - True - True - False - - - - - - - - - - True - True - 1 - - - - - True - True - 0 - - - - - 1 - - - - - True - False - - - True - False - gtk-refresh - 1 - - - True - True - 0 - - - - - True - False - 0.49000000953674316 - Recent calls - - - True - True - 1 - - - - - 1 - False - - - - - True - False - 0.5 - none - - - True - False - 0 - 0 - - - True - False - 0 - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 4 - 4 - True - - - D - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 3 - 4 - 3 - 4 - - - - - # - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 2 - 3 - 3 - 4 - - - - - 0 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - 3 - 4 - - - - - * - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 3 - 4 - - - - - C - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 3 - 4 - 2 - 3 - - - - - 9 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 2 - 3 - 2 - 3 - - - - - 8 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - 2 - 3 - - - - - 7 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 2 - 3 - - - - - B - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 3 - 4 - 1 - 2 - - - - - 6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 2 - 3 - 1 - 2 - - - - - 5 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - 1 - 2 - - - - - 4 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - - - - - A - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 3 - 4 - - - - - 3 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 2 - 3 - - - - - 2 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - 1 - 2 - - - - - 1 - 40 - 40 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False - - - - - - - - - - - - - - 2 - - - - - True - False - - - True - False - gtk-missing-image - 1 - - - True - True - 0 - - - - - True - False - Keypad - - - True - True - 1 - - - - - 2 - False - - - - - True - True - 1 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - none - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - model3 - 0 - - - - - 0 - - - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - My current identity: - True - - - - - False - False - 2 - - - - - True - True - 0 - - - - - False - 0 - etched-out - - - True - False - 12 - - - True - False - - - True - False - gtk-missing-image - - - True - True - 0 - - - - - True - False - 0 - none - - - True - False - 12 - 12 - - - True - False - 4 - 2 - - - True - False - Username - - - - - True - False - Password - - - 1 - 2 - - - - - True - False - Internet connection: - - - 2 - 3 - - - - - True - True - ● - False - False - - - 1 - 2 - - - - - True - True - False - ● - False - False - - - 1 - 2 - 1 - 2 - - - - - True - False - model4 - 0 - - - - - 0 - - - - - 1 - 2 - 2 - 3 - - - - - Automatically log me in - True - True - False - False - True - - - 1 - 2 - 3 - 4 - - - - - - - - - - - - True - False - Login information - True - - - - - True - True - 10 - 1 - - - - - True - False - - - gtk-connect - True - True - True - False - True - - - - False - False - 0 - - - - - True - True - 2 - - - - - - - - - True - False - <b>Welcome !</b> - True - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - False - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - True - 0 - - - - - True - True - True - False - none - - - - False - True - 5 - 1 - - - - - False - False - 2 - - - - - @@ -1804,4 +434,1151 @@ + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + + + True + _Options + True + + + + True + + + gtk-preferences + True + True + True + + + + + + gtk-disconnect + True + True + + + + + + True + + + + + True + Always start video + True + + + + + + True + Enable self-view + True + True + + + + + + True + + + + + gtk-quit + True + True + + + + + + + + + + True + _Help + True + + + True + + + gtk-about + True + True + True + + + + + + Show debug window + True + image1 + False + + + + + + _Homepage + True + True + image4 + False + + + + + + Check _Updates + True + image5 + False + + + + + + Account assistant + image12 + False + + + + + + + + + + False + 0 + + + + + True + + + True + + + True + + + True + True + True + + + + False + False + 0 + + + + + True + True + Initiate a new call + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + True + Enter username, phone number, or full sip address + ● + + + + 0 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + SIP address or phone number: + True + + + + + 2 + + + + + True + True + True + + + + False + False + 3 + + + + + False + 8 + 0 + + + + + True + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Lookup: + + + 12 + 0 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + + 4 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + in + + + 8 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + model1 + 0 + + + + + 0 + + + + + 4 + 3 + + + + + False + 0 + + + + + True + True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + + + + + + + + + 1 + + + + + 0 + none + + + + + True + True + ● + True + + + + + + + 0 + + + + + True + True + True + none + + + + True + + + True + gtk-find + + + 0 + + + + + True + Search + + + 1 + + + + + + + False + 1 + + + + + + + True + <b>Add contacts from directory</b> + True + + + + + False + False + 5 + 2 + + + + + True + + + Add contact + True + True + image10 + + + + False + False + 0 + + + + + False + False + 3 + + + + + 0 + + + + + + + True + + + True + gtk-directory + 1 + + + 0 + + + + + True + Contacts + + + 1 + + + + + False + + + + + True + + + True + 2 + + + True + True + never + + + True + True + False + + + + + + + 1 + + + + + True + end + + + gtk-clear + True + True + True + True + + + + False + False + 0 + + + + + + + + + + + False + end + 0 + + + + + 0 + + + + + 1 + + + + + True + + + True + gtk-refresh + 1 + + + 0 + + + + + True + 0.49000000953674316 + Recent calls + + + 1 + + + + + 1 + False + + + + + True + 0.5 + none + + + True + 0 + 0 + + + True + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + 4 + 4 + True + + + D + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 3 + 4 + + + + + # + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 3 + 4 + + + + + 0 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 3 + 4 + + + + + * + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + + + + + C + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 2 + 3 + + + + + 9 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 2 + 3 + + + + + 8 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 2 + 3 + + + + + 7 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + + + + + B + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + 1 + 2 + + + + + 6 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + 1 + 2 + + + + + 5 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + 1 + 2 + + + + + 4 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + A + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 3 + 4 + + + + + 3 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 2 + 3 + + + + + 2 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + 1 + 40 + 40 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + + + + + + + + + 2 + + + + + True + + + True + gtk-missing-image + 1 + + + 0 + + + + + True + Keypad + + + 1 + + + + + 2 + False + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + none + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + model3 + 0 + + + + + 0 + + + + + + + True + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + My current identity: + True + + + 0 + + + + + True + True + none + + + + True + gtk-refresh + + + + + 1 + + + + + + + False + False + 2 + + + + + 0 + + + + + 0 + etched-out + + + True + 12 + + + True + + + True + gtk-missing-image + + + 0 + + + + + True + 0 + none + + + True + 12 + 12 + + + True + 4 + 2 + + + True + Username + + + + + True + Password + + + 1 + 2 + + + + + True + Internet connection: + + + 2 + 3 + + + + + True + True + ● + + + 1 + 2 + + + + + True + True + False + ● + + + 1 + 2 + 1 + 2 + + + + + True + model4 + 0 + + + + + 0 + + + + + 1 + 2 + 2 + 3 + + + + + Automatically log me in + True + True + False + True + + + 1 + 2 + 3 + 4 + + + + + + + + + + + + True + Login information + True + + + + + 10 + 1 + + + + + True + + + gtk-connect + True + True + True + True + + + + False + False + 0 + + + + + 2 + + + + + + + + + True + <b>Welcome !</b> + True + + + + + 1 + + + + + 1 + + + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + + + 0 + + + + + True + True + True + none + + + + False + 5 + 1 + + + + + False + False + 2 + + + + + From 7fcaf449af301b89dc7fc614c8c539950ca51341 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 15 May 2012 12:25:46 +0200 Subject: [PATCH 6/8] Update mediastreamer2 & oRTP --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 8f038bf38..b2b50e9fd 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 8f038bf38022e1a7c13b88f5b00c1d1ba3ef2386 +Subproject commit b2b50e9fd7c946f9bd49fc02f98579794a63a14b diff --git a/oRTP b/oRTP index 21b8cec3b..f7861fa0e 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 21b8cec3b70108f54d8550db26db01629777d62d +Subproject commit f7861fa0e1204091e3bb9aa2f05643f819d1a2b1 From c9f89e6aa3e6be80a6e0139045eb92990ce487e2 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 15 May 2012 14:34:58 +0200 Subject: [PATCH 7/8] Do not tread ACK event if call has been terminated --- coreapi/sal_eXosip2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 6a4e2b284..d1cf241ab 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -1062,6 +1062,10 @@ static void handle_ack(Sal *sal, eXosip_event_t *ev){ ms_warning("ack for non-existing call !"); return; } + if (op->terminated) { + ms_warning("ack for terminated call, ignoring"); + return; + } if (op->sdp_offering){ sdp=eXosip_get_sdp_info(ev->ack); From e74d43779caf53e19cad16633b193071ed57d5f2 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 15 May 2012 17:08:57 +0200 Subject: [PATCH 8/8] Add rtp timestamp configure option + debug option Update oRTP & mediastreamer2 --- configure.ac | 21 +++++++++++++++++++++ mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2bead21dd..a56a93cbd 100644 --- a/configure.ac +++ b/configure.ac @@ -245,6 +245,24 @@ if test x$ipv6 = xtrue ; then fi AC_SUBST(IPV6_CFLAGS) +dnl enable timestamp support +AC_ARG_ENABLE(rtp-timestamp, + [ --enable-rtp-timestamp Turn on RTP packet timestamp], + [case "${enableval}" in + yes) rtptimestamp=true;; + no) rtptimestamp=false;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtp-timestamp) ;; + esac],[rtptimestamp=false]) + +AC_ARG_ENABLE(debug, + [ --enable-debug=[yes/no] enables the display of traces showing the execution of the library. [default=yes]], + [case "${enableval}" in + yes) debug_enabled=yes;; + no) debug_enabled=no;; + *) AC_MSG_ERROR("Bad value for --enable-debug");; + esac], + [debug_enabled=no]) + dnl enable truespeech codec support AC_ARG_ENABLE(truespeech, [ --enable-truespeech Turn on TrueSpeech support (x86 only)], @@ -562,6 +580,9 @@ else if test x$ac_cv_c_bigendian = xyes ; then ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_BIGENDIAN" fi + if test x$rtptimestamp = xtrue ; then + ORTP_CFLAGS="$ORTP_CFLAGS -DORTP_TIMESTAMP" + fi ORTP_DIR=oRTP changequote(<<, >>) ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'` diff --git a/mediastreamer2 b/mediastreamer2 index b2b50e9fd..241333872 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit b2b50e9fd7c946f9bd49fc02f98579794a63a14b +Subproject commit 2413338721f9ac82249a47b333ccca53fb7d3359 diff --git a/oRTP b/oRTP index f7861fa0e..9d8e0cc62 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit f7861fa0e1204091e3bb9aa2f05643f819d1a2b1 +Subproject commit 9d8e0cc62b8da06d596f4ed2b62e2c98dad990b3