From 1786e45523e0b93ca56ae48cb7d0c42f5726cbe5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 10 Jul 2014 14:35:11 +0200 Subject: [PATCH] Fix for when using software echo cancellation + updated liblinphone --- res/raw/linphonerc_factory | 3 --- src/org/linphone/setup/SetupActivity.java | 6 +++++- submodules/linphone | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory index 8907cbf82..17fed0bd4 100644 --- a/res/raw/linphonerc_factory +++ b/res/raw/linphonerc_factory @@ -29,9 +29,6 @@ rtcp_xr_voip_metrics_enabled=1 playback_dev_id= ringer_dev_id= capture_dev_id= -#playback_dev_id=ANDROID SND (deprecated): Android Sound card -#ringer_dev_id=ANDROID SND (deprecated): Android Sound card -#capture_dev_id=ANDROID SND (deprecated): Android Sound card remote_ring=/data/data/org.linphone/files/ringback.wav local_ring=/data/data/org.linphone/files/oldphone_mono.wav dtmf_player_amp=0.1 diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index 09ee4229d..9dbd64dc8 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -168,7 +168,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { } private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) { - if (LinphoneManager.getLc().needsEchoCalibration() && mPrefs.isFirstLaunch()) { + boolean needsEchoCalibration = LinphoneManager.getLc().needsEchoCalibration(); + if (needsEchoCalibration && mPrefs.isFirstLaunch()) { EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment(); fragment.enableEcCalibrationResultSending(sendEcCalibrationResult); changeFragment(fragment); @@ -178,6 +179,9 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { next.setEnabled(false); cancel.setEnabled(false); } else { + if (mPrefs.isFirstLaunch()) { + mPrefs.setEchoCancellation(false); + } success(); } } diff --git a/submodules/linphone b/submodules/linphone index b5aeb7e75..b46871412 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b5aeb7e7553ed1efc8d91384b29bf4116def4545 +Subproject commit b4687141227948a321867dddbc815522710b4f3f