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

Update exosip & linphone submodule + using setVideoPolicy

Browse source
This commit is contained in:
Sylvain Berfini 2012-03-01 12:14:15 +01:00
parent ce089b16a7
commit bd60ad4276
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/org/linphone/LinphoneManager.java
View file

@ -458,7 +458,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
mLc.setRing(null); mLc.setRing(null);
mLc.setRootCA(mLinphoneRootCaFile); mLc.setRootCA(mLinphoneRootCaFile);
mLc.setPlayFile(mPauseSoundFile); mLc.setPlayFile(mPauseSoundFile);
mLc.setVideoPolicy(isAutoInitiateVideoCalls(), isAutoAcceptCamera());
try { try {
initFromConf(); initFromConf();
@ -1098,9 +1098,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
return isVideoEnabled() && getPrefBoolean(R.string.pref_video_automatically_share_my_video_key, false); return isVideoEnabled() && getPrefBoolean(R.string.pref_video_automatically_share_my_video_key, false);
} }
public boolean autoAcceptCamera() { public boolean isAutoAcceptCamera() {
return getPrefBoolean(R.string.pref_video_automatically_accept_video_key, false); return getPrefBoolean(R.string.pref_video_automatically_accept_video_key, false);
} }
public boolean isAutoInitiateVideoCalls() {
return getPrefBoolean(R.string.pref_video_initiate_call_with_video_key, false);
}
public void setAudioModeIncallForGalaxyS() { public void setAudioModeIncallForGalaxyS() {
mAudioManager.setMode(MODE_IN_CALL); mAudioManager.setMode(MODE_IN_CALL);
@ -1325,6 +1329,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
if (state == State.CallEnd && mLc.getCallsNb() == 0) { if (state == State.CallEnd && mLc.getCallsNb() == 0) {
routeAudioToReceiver(); routeAudioToReceiver();
} }
if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message); if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) { for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
l.onCallStateChanged(call, state, message); l.onCallStateChanged(call, state, message);

5
src/org/linphone/core/LinphoneCoreImpl.java
View file

@ -692,4 +692,9 @@ class LinphoneCoreImpl implements LinphoneCore {
throws LinphoneCoreException { throws LinphoneCoreException {
deferCallUpdate(nativePtr, aCall, params); deferCallUpdate(nativePtr, aCall, params);
} }
private native void setVideoPolicy(long nativePtr, boolean autoInitiate, boolean autoAccept);
public void setVideoPolicy(boolean autoInitiate, boolean autoAccept) {
setVideoPolicy(nativePtr, autoInitiate, autoAccept);
}
} }

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit c3da0303519ad3120355cb85baee9cf6d0e4d1c2 Subproject commit 7f12fd70a3109a8d3c8e874a16d2992231ce9915

2
submodules/linphone

@ -1 +1 @@
Subproject commit 221c0c58067b858c9cee8a8aadb3a763003b7887 Subproject commit 9bb8621513b435ff07b8a66138941632f5130710