Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git.linphone.org:linphone-android

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Guillaume Beraudo 2011-01-24 14:10:23 +01:00
commit 77e9fce291
4 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/AboutActivity.java
View file

@ -37,6 +37,6 @@ public class AboutActivity extends Activity {
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.e(LinphoneService.TAG, "cannot get version name", e); Log.e(LinphoneService.TAG, "cannot get version name", e);
} }
} }
} }

14
src/org/linphone/DialerActivity.java
View file

@ -596,6 +596,12 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
} else { } else {
mAudioManager.setSpeakerphoneOn(true); mAudioManager.setSpeakerphoneOn(true);
} }
LinphoneCore lLinphoneCore = LinphoneService.instance().getLinphoneCore();
if (lLinphoneCore.isIncall()) {
/*disable EC*/
lLinphoneCore.getCurrentCall().enableEchoCancellation(false);
lLinphoneCore.getCurrentCall().enableEchoLimiter(true);
}
} }
private void routeAudioToReceiver() { private void routeAudioToReceiver() {
@ -604,7 +610,13 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL); AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
} else { } else {
mAudioManager.setSpeakerphoneOn(false); mAudioManager.setSpeakerphoneOn(false);
} }
LinphoneCore lLinphoneCore = LinphoneService.instance().getLinphoneCore();
if (lLinphoneCore.isIncall()) {
//Restore default value
lLinphoneCore.getCurrentCall().enableEchoCancellation(lLinphoneCore.isEchoCancellationEnabled());
lLinphoneCore.getCurrentCall().enableEchoLimiter(false);
}
} }
private void callPending(LinphoneCall call) { private void callPending(LinphoneCall call) {
mDecline.setEnabled(true); mDecline.setEnabled(true);

2
src/org/linphone/LinphoneActivity.java
View file

@ -160,7 +160,7 @@ public class LinphoneActivity extends TabActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
} }
@Override @Override

18
src/org/linphone/core/LinphoneCallImpl.java
View file

@ -31,7 +31,10 @@ class LinphoneCallImpl implements LinphoneCall {
native private int getState(long nativePtr); native private int getState(long nativePtr);
private native long getCurrentParamsCopy(long nativePtr); private native long getCurrentParamsCopy(long nativePtr);
private native void enableCamera(long nativePtr, boolean enabled); private native void enableCamera(long nativePtr, boolean enabled);
private native void enableEchoCancellation(long nativePtr,boolean enable);
private native boolean isEchoCancellationEnabled(long nativePtr) ;
private native void enableEchoLimiter(long nativePtr,boolean enable);
private native boolean isEchoLimiterEnabled(long nativePtr) ;
protected LinphoneCallImpl(long aNativePtr) { protected LinphoneCallImpl(long aNativePtr) {
nativePtr = aNativePtr; nativePtr = aNativePtr;
@ -72,4 +75,17 @@ class LinphoneCallImpl implements LinphoneCall {
public boolean equals(Object call) { public boolean equals(Object call) {
return nativePtr == ((LinphoneCallImpl)call).nativePtr; return nativePtr == ((LinphoneCallImpl)call).nativePtr;
} }
public void enableEchoCancellation(boolean enable) {
enableEchoCancellation(nativePtr,enable);
}
public boolean isEchoCancellationEnabled() {
return isEchoCancellationEnabled(nativePtr);
}
public void enableEchoLimiter(boolean enable) {
enableEchoLimiter(nativePtr,enable);
}
public boolean isEchoLimiterEnabled() {
return isEchoLimiterEnabled(nativePtr);
}
} }