diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index edb2ddc06..3adf864be 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -541,14 +541,13 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach //read codecs from setting bundle and enable them one by one if ([self isNotIphone3G]) { - [self configurePayloadType:"speex" fromPrefKey:@"speex_16k_preference" withRate:16000]; - [self configurePayloadType:"speex" fromPrefKey:@"speex_8k_preference" withRate:8000]; + [self configurePayloadType:"SILK" fromPrefKey:@"silk_24k_preference" withRate:24000]; } - else - { - ms_message("SPEEX codecs deactivated"); + else { + ms_message("SILK 24khz codec deactivated"); } - [self configurePayloadType:"SILK" fromPrefKey:@"silk_24k_preference" withRate:24000]; + [self configurePayloadType:"speex" fromPrefKey:@"speex_16k_preference" withRate:16000]; + [self configurePayloadType:"speex" fromPrefKey:@"speex_8k_preference" withRate:8000]; [self configurePayloadType:"SILK" fromPrefKey:@"silk_16k_preference" withRate:16000]; [self configurePayloadType:"AMR" fromPrefKey:@"amr_8k_preference" withRate:8000]; [self configurePayloadType:"GSM" fromPrefKey:@"gsm_8k_preference" withRate:8000]; @@ -568,9 +567,13 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach [self configurePayloadType:"H264" fromPrefKey:@"h264_preference" withRate:90000]; [self configurePayloadType:"VP8" fromPrefKey:@"vp8_preference" withRate:90000]; - bool enableVideo = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_video_preference"]; - linphone_core_enable_video(theLinphoneCore, enableVideo, enableVideo); - + if ([self isNotIphone3G]) { + bool enableVideo = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_video_preference"]; + linphone_core_enable_video(theLinphoneCore, enableVideo, enableVideo); + } else { + linphone_core_enable_video(theLinphoneCore, FALSE, FALSE); + ms_warning("Disable video for phones prior to iPhone 3GS"); + } bool enableSrtp = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_srtp_preference"]; linphone_core_set_media_encryption(theLinphoneCore, enableSrtp?LinphoneMediaEncryptionSRTP:LinphoneMediaEncryptionNone); diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m index 82726e6c8..e4ccdceb6 100644 --- a/Classes/LinphoneUI/UICallButton.m +++ b/Classes/LinphoneUI/UICallButton.m @@ -65,7 +65,7 @@ linphone_address_set_display_name(tmpAddress,[mDisplayName.text length]>0?[mDisplayName.text cStringUsingEncoding:[NSString defaultCStringEncoding]]:nil); - linphone_call_params_enable_video(lcallParams,startVideo); + linphone_call_params_enable_video(lcallParams,startVideo&linphone_core_video_enabled([LinphoneManager getLc])); linphone_core_invite_address_with_params([LinphoneManager getLc],tmpAddress,lcallParams) ; linphone_address_destroy(tmpAddress); diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib index d3eba61df..8e5e6ac92 100644 --- a/Classes/PhoneViewController.xib +++ b/Classes/PhoneViewController.xib @@ -71,7 +71,7 @@ 3 MC41AA - + NSImage effacer.png diff --git a/Resources/HP.png b/Resources/HP.png index 95d132189..b3527b782 100755 Binary files a/Resources/HP.png and b/Resources/HP.png differ diff --git a/Resources/HP_inverse.png b/Resources/HP_inverse.png index e343dba73..983f799de 100755 Binary files a/Resources/HP_inverse.png and b/Resources/HP_inverse.png differ diff --git a/Resources/ajouter.png b/Resources/ajouter.png index c1526d8ba..22127c463 100755 Binary files a/Resources/ajouter.png and b/Resources/ajouter.png differ diff --git a/Resources/clavier.png b/Resources/clavier.png index 3d2d9495b..df1026b65 100755 Binary files a/Resources/clavier.png and b/Resources/clavier.png differ diff --git a/Resources/contact.png b/Resources/contact.png index ecf2b1603..32a5aee96 100755 Binary files a/Resources/contact.png and b/Resources/contact.png differ diff --git a/Resources/effacer.png b/Resources/effacer.png index 685c72cbb..eee5833b3 100755 Binary files a/Resources/effacer.png and b/Resources/effacer.png differ diff --git a/Resources/grouper.png b/Resources/grouper.png index 70ed3cbc7..6ca595e43 100755 Binary files a/Resources/grouper.png and b/Resources/grouper.png differ diff --git a/Resources/micro.png b/Resources/micro.png index 7c694fbff..1eee9ceef 100755 Binary files a/Resources/micro.png and b/Resources/micro.png differ diff --git a/Resources/micro_inverse.png b/Resources/micro_inverse.png index dc38d85a6..b4cd9f588 100755 Binary files a/Resources/micro_inverse.png and b/Resources/micro_inverse.png differ diff --git a/Resources/pause.png b/Resources/pause.png index 37d96580b..4875f41c2 100755 Binary files a/Resources/pause.png and b/Resources/pause.png differ diff --git a/Resources/pause_inactif.png b/Resources/pause_inactif.png index 0b46f283c..c43d5fbce 100755 Binary files a/Resources/pause_inactif.png and b/Resources/pause_inactif.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 68ec64abc..3986b1c48 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -96,7 +96,7 @@ 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; 227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; - 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; }; + 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 228B19AF130290C500F154D3 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; }; 22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; 22968A8812F87C2000588287 /* UIDuration.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A8712F87C2000588287 /* UIDuration.m */; }; diff --git a/submodules/linphone b/submodules/linphone index 0d04b9451..53b732a7d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0d04b9451bf845e8bd7f047504f689292e099554 +Subproject commit 53b732a7d32fe1f3005f39e446fb860de0afa97c