From 49a253782694f1c9aecc13717f565155a3e851bd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 18 May 2012 15:08:14 +0200 Subject: [PATCH 1/5] set proper ordering of digit buttons on ipad --- Classes/PhoneViewController-ipad.xib | 56 +++++++++++++++------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/Classes/PhoneViewController-ipad.xib b/Classes/PhoneViewController-ipad.xib index fc15c4af0..0b5db5b31 100644 --- a/Classes/PhoneViewController-ipad.xib +++ b/Classes/PhoneViewController-ipad.xib @@ -1,14 +1,14 @@ - 1280 - 11C74 - 1938 - 1138.23 - 567.00 + 1296 + 11E53 + 2182 + 1138.47 + 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1181 IBUIViewController @@ -325,7 +325,7 @@ IBIPadFramework 0 0 - 4 + 6 1 @@ -371,7 +371,7 @@ IBIPadFramework 0 0 - 6 + 4 1 @@ -583,14 +583,6 @@ 47 - - - four - - - - 48 - hash @@ -623,14 +615,6 @@ 52 - - - six - - - - 53 - star @@ -727,6 +711,22 @@ 62 + + + four + + + + 63 + + + + six + + + + 64 + @@ -940,7 +940,7 @@ - 62 + 64 @@ -1121,6 +1121,10 @@ 0 IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + YES 3 @@ -1131,6 +1135,6 @@ {60, 52} {60, 52} - 933 + 1181 From 63049d2fc72feb66ded5270cdbde38eec5e4d72a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 21 May 2012 23:32:53 +0200 Subject: [PATCH 2/5] fix speaker button behavior --- Classes/IncallViewController.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index 31a06e8aa..436e65921 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -667,8 +667,8 @@ void addAnimationFadeTransition(UIView* view, float duration) { dismissed = false; UIDevice *device = [UIDevice currentDevice]; device.proximityMonitoringEnabled = YES; - if ([speaker isOn]) - [speaker toggle]; + //if ([speaker isOn]) + // [speaker toggle]; [self updateUIFromLinphoneState: YES]; } @@ -681,7 +681,7 @@ void addAnimationFadeTransition(UIView* view, float duration) { UIDevice *device = [UIDevice currentDevice]; device.proximityMonitoringEnabled = YES; if (call !=nil && linphone_call_get_dir(call)==LinphoneCallIncoming) { - if ([speaker isOn]) [speaker toggle]; + //if ([speaker isOn]) [speaker toggle]; } [self updateUIFromLinphoneState: YES]; From bbfa193ce1be91c81bd2be4244559184fcbd9619 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 22 May 2012 15:32:03 +0200 Subject: [PATCH 3/5] update exosip to use tcp_nodelay --- submodules/externals/exosip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/exosip b/submodules/externals/exosip index 014f5a021..8c42924ae 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit 014f5a021ad4a0c024088edbb721f144a6f96699 +Subproject commit 8c42924ae9009f6003e98d29638e078ca1bd7c71 From 6748f3ec7f8af2f328505a79b716e546b0dab9cd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 23 May 2012 17:44:31 +0200 Subject: [PATCH 4/5] update linphone submodule for bugfixes --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 04fa4d457..bad6c152f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 04fa4d457b3b584eae8c5964a48a97ec4040c94a +Subproject commit bad6c152f1521de8648d47c70e9321b7668b40b5 From 1d9c0c7859ca0224f62717c6fac85376d202fe26 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 30 May 2012 14:41:47 +0200 Subject: [PATCH 5/5] unregister audio listener from speaker button --- Classes/LinphoneUI/UISpeakerButton.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m index 10fdf5b5f..1508f4cdf 100644 --- a/Classes/LinphoneUI/UISpeakerButton.m +++ b/Classes/LinphoneUI/UISpeakerButton.m @@ -22,6 +22,7 @@ #include "linphonecore.h" @implementation UISpeakerButton +static AudioSessionPropertyID routeChangeID = kAudioSessionProperty_AudioRouteChange; static void audioRouteChangeListenerCallback ( void *inUserData, // 1 @@ -36,7 +37,7 @@ static void audioRouteChangeListenerCallback ( -(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage debugName:(const char *)name{ [super initWithOnImage:onImage offImage:offImage debugName:name]; - AudioSessionPropertyID routeChangeID = kAudioSessionProperty_AudioRouteChange; + AudioSessionInitialize(NULL, NULL, NULL, NULL); OSStatus lStatus = AudioSessionAddPropertyListener(routeChangeID, audioRouteChangeListenerCallback, self); if (lStatus) { @@ -85,7 +86,11 @@ static void audioRouteChangeListenerCallback ( */ - (void)dealloc { - [super dealloc]; + OSStatus lStatus = AudioSessionRemovePropertyListenerWithUserData(routeChangeID, audioRouteChangeListenerCallback, self); + if (lStatus) { + ms_error ("cannot un register route change handler [%ld]",lStatus); + } + [super dealloc]; }