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

allow auto replacement of calls and update ffmpeg commit id due to forced update

Browse source
This commit is contained in:
Simon Morlat 2011-02-02 22:25:50 +01:00
parent f7f0242a8a
commit db1b07b363
5 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/raw/linphonerc
View file

@ -16,6 +16,7 @@ register_only_when_network_is_up=1
default_proxy=0 default_proxy=0
auto_net_state_mon=0 auto_net_state_mon=0
keepalive_period=30000 keepalive_period=30000
auto_answer_replacing_calls=1
[rtp] [rtp]
audio_rtp_port=7076 audio_rtp_port=7076

7
src/org/linphone/LinphoneService.java
View file

@ -271,8 +271,11 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
public void callState(final LinphoneCore lc,final LinphoneCall call, final State state, final String message) { public void callState(final LinphoneCore lc,final LinphoneCall call, final State state, final String message) {
Log.i(TAG, "new state ["+state+"]"); Log.i(TAG, "new state ["+state+"]");
if (state == LinphoneCall.State.IncomingReceived && !call.equals(mLinphoneCore.getCurrentCall())) { if (state == LinphoneCall.State.IncomingReceived && !call.equals(mLinphoneCore.getCurrentCall())) {
//no multicall support, just decline if (call.getReplacedCall()==null){
mLinphoneCore.terminateCall(call); //no multicall support, just decline
mLinphoneCore.terminateCall(call);
}//otherwise it will be accepted automatically.
return; return;
} }
mHandler.post(new Runnable() { mHandler.post(new Runnable() {

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

@ -34,7 +34,8 @@ class LinphoneCallImpl implements LinphoneCall {
private native void enableEchoCancellation(long nativePtr,boolean enable); private native void enableEchoCancellation(long nativePtr,boolean enable);
private native boolean isEchoCancellationEnabled(long nativePtr) ; private native boolean isEchoCancellationEnabled(long nativePtr) ;
private native void enableEchoLimiter(long nativePtr,boolean enable); private native void enableEchoLimiter(long nativePtr,boolean enable);
private native boolean isEchoLimiterEnabled(long nativePtr) ; private native boolean isEchoLimiterEnabled(long nativePtr);
private native long getReplacedCall(long nativePtr);
protected LinphoneCallImpl(long aNativePtr) { protected LinphoneCallImpl(long aNativePtr) {
nativePtr = aNativePtr; nativePtr = aNativePtr;
@ -88,4 +89,12 @@ class LinphoneCallImpl implements LinphoneCall {
public boolean isEchoLimiterEnabled() { public boolean isEchoLimiterEnabled() {
return isEchoLimiterEnabled(nativePtr); return isEchoLimiterEnabled(nativePtr);
} }
public LinphoneCall getReplacedCall(){
long callptr=getReplacedCall(nativePtr);
if (callptr!=0){
return new LinphoneCallImpl(callptr);
}
return null;
}
} }

2
submodules/externals/ffmpeg vendored

@ -1 +1 @@
Subproject commit 492347d3bbf6cdae54dd8b68fb447e7496aed04f Subproject commit 4dece8c7f8255fb3c4ad9fb7fd25a8ba7692fd27

2
submodules/linphone

@ -1 +1 @@
Subproject commit cb7e67278afd85efab4dbb15650d2e9f609bedd4 Subproject commit e69c8b2b444fefc2a8b18059b73a428e329b3dc2