From 200e878c401019e8f8f072c3f442eb40da198ad2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 Sep 2012 22:59:54 +0200 Subject: [PATCH] deprecate LinphoneCore.adjustSoftareVolume(), because it does the same as setPlaybackGain()o --- src/org/linphone/LinphoneManager.java | 2 +- src/org/linphone/core/LinphoneCoreImpl.java | 3 +-- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 837884ed7..011738bc4 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -1201,7 +1201,7 @@ public final class LinphoneManager implements LinphoneCoreListener { if (nextVolume > maxVolume) nextVolume = maxVolume; if (nextVolume < 0) nextVolume = 0; - mLc.adjustSoftwareVolume((nextVolume - maxVolume)* dbStep); + mLc.setPlaybackGain((nextVolume - maxVolume)* dbStep); } else // starting from ICS, volume must be adjusted by the application, at least for STREAM_VOICE_CALL volume stream mAudioManager.adjustStreamVolume(LINPHONE_VOLUME_STREAM, i<0?AudioManager.ADJUST_LOWER:AudioManager.ADJUST_RAISE, 0); diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index 80dcaa48e..8a870cc0e 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -93,7 +93,6 @@ class LinphoneCoreImpl implements LinphoneCore { private native int getSignalingTransportPort(long nativePtr, int code); private native void setSignalingTransportPorts(long nativePtr, int udp, int tcp, int tls); private native void enableIpv6(long nativePtr,boolean enable); - private native void adjustSoftwareVolume(long nativePtr,int db); private native int pauseCall(long nativePtr, long callPtr); private native int pauseAllCalls(long nativePtr); private native int resumeCall(long nativePtr, long callPtr); @@ -474,7 +473,7 @@ class LinphoneCoreImpl implements LinphoneCore { enableIpv6(nativePtr,enable); } public synchronized void adjustSoftwareVolume(int i) { - adjustSoftwareVolume(nativePtr, i); + //deprecated, does the same as setPlaybackGain(). } public synchronized boolean pauseCall(LinphoneCall call) { diff --git a/submodules/linphone b/submodules/linphone index da4114607..c2e7592a2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit da4114607f0d080efb9bcee2fa0dbcc94a2f0d17 +Subproject commit c2e7592a2a349104ed2aa4121e1e4d44633a0908