From 182d7989d8f4426c2a78e548647f00d57040c98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 14 Oct 2014 16:05:52 +0200 Subject: [PATCH] Add a window ID parameter to LinphoneCore.createFilePlayer() --- java/common/org/linphone/core/LinphoneCore.java | 2 +- java/impl/org/linphone/core/LinphoneCoreImpl.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java index 26b721675..dfa2f6bca 100644 --- a/java/common/org/linphone/core/LinphoneCore.java +++ b/java/common/org/linphone/core/LinphoneCore.java @@ -1786,7 +1786,7 @@ public interface LinphoneCore { * Create a media player * @return An object that implement LinphonePlayer */ - public LinphonePlayer createPlayer(); + public LinphonePlayer createPlayer(AndroidVideoWindowImpl window); /** * Destroy a player diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java index 8bd3f0d7e..750ec1903 100644 --- a/java/impl/org/linphone/core/LinphoneCoreImpl.java +++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java @@ -25,6 +25,7 @@ import java.io.IOException; import org.linphone.core.LinphoneCall.State; import org.linphone.mediastream.Log; +import org.linphone.mediastream.video.AndroidVideoWindowImpl; import org.linphone.mediastream.video.capture.hwconf.Hacks; import android.content.Context; @@ -1279,12 +1280,12 @@ class LinphoneCoreImpl implements LinphoneCore { return getFileTransferServer(nativePtr); } - private native long createPlayer(long nativePtr); + private native long createPlayer(long nativePtr, AndroidVideoWindowImpl window); @Override - public synchronized LinphonePlayer createPlayer() { - long player = createPlayer(nativePtr); - if(player != 0) { - return new LinphonePlayerImpl(createPlayer(nativePtr)); + public synchronized LinphonePlayer createPlayer(AndroidVideoWindowImpl window) { + long playerPtr = createPlayer(nativePtr, window); + if(playerPtr != 0) { + return new LinphonePlayerImpl(playerPtr); } else { return null; }