diff --git a/.classpath b/.classpath index 902041fc9..f4e4d7517 100644 --- a/.classpath +++ b/.classpath @@ -4,8 +4,7 @@ - - + diff --git a/build.xml b/build.xml index 1e18ac78e..db69a1e7c 100644 --- a/build.xml +++ b/build.xml @@ -1048,10 +1048,10 @@ - + diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index a6b19e7eb..2dbdffcd1 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -49,6 +49,7 @@ import java.util.TimerTask; import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener; import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener.AudioState; +import org.linphone.LinphoneSimpleListener.LinphoneOnDTMFReceivedListener; import org.linphone.LinphoneSimpleListener.LinphoneOnTextReceivedListener; import org.linphone.LinphoneSimpleListener.LinphoneServiceListener; import org.linphone.core.CallDirection; @@ -57,7 +58,6 @@ import org.linphone.core.LinphoneAuthInfo; import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCallStats; -import org.linphone.core.LinphoneCallStats.MediaType; import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore.EcCalibratorStatus; @@ -908,6 +908,11 @@ public final class LinphoneManager implements LinphoneCoreListener { public void setOnTextReceivedListener(LinphoneOnTextReceivedListener listener) { textReceivedListener = listener; } + + private LinphoneOnDTMFReceivedListener dtmfReceivedListener; + public void setOnDTMFReceivedListener(LinphoneOnDTMFReceivedListener listener) { + dtmfReceivedListener = listener; + } public void displayWarning(LinphoneCore lc, String message) {} public void authInfoRequested(LinphoneCore lc, String realm, String username) {} @@ -921,6 +926,10 @@ public final class LinphoneManager implements LinphoneCoreListener { if (textReceivedListener != null) textReceivedListener.onTextReceived(from, message); } + public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) { + if (dtmfReceivedListener != null) + dtmfReceivedListener.onDTMFReceived(call, dtmf); + } public String getLastLcStatusMessage() { diff --git a/src/org/linphone/LinphoneSimpleListener.java b/src/org/linphone/LinphoneSimpleListener.java index 87d27980c..0a10cebf1 100644 --- a/src/org/linphone/LinphoneSimpleListener.java +++ b/src/org/linphone/LinphoneSimpleListener.java @@ -62,5 +62,9 @@ public interface LinphoneSimpleListener { public static interface LinphoneOnTextReceivedListener extends LinphoneSimpleListener { void onTextReceived(LinphoneAddress from, String message); } + + public static interface LinphoneOnDTMFReceivedListener extends LinphoneSimpleListener { + void onDTMFReceived(LinphoneCall call, int dtmf); + } } diff --git a/submodules/linphone b/submodules/linphone index 2b7af371f..7e541dc76 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2b7af371f94040941cfae5d1364751eb8963a7f7 +Subproject commit 7e541dc76ac34aba16cbe2656493b3573c1d9afb