mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-24 22:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename LinphoneCore.createPlayer() into LinphoneCore.createLocalPlayer()

Browse source
This commit is contained in:
François Grisez 2014-10-15 16:42:40 +02:00
parent 0f52361549
commit a6c013bdb7
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/linphonecore_jni.cc
View file

@ -5305,7 +5305,7 @@ extern "C" void Java_org_linphone_core_LinphonePlayerImpl_destroy(JNIEnv *env, j
linphone_player_destroy(player);
}
extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createPlayer(JNIEnv *env, jobject jobj, jlong ptr, jobject window) {
extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createLocalPlayer(JNIEnv *env, jobject jobj, jlong ptr, jobject window) {
jobject window_ref = NULL;
MSSndCard *snd_card = ms_snd_card_manager_get_default_playback_card(ms_snd_card_manager_get());
if(snd_card == NULL) {

2
java/common/org/linphone/core/LinphoneCore.java
View file

@ -1786,5 +1786,5 @@ public interface LinphoneCore {
* Create a media player
* @return An object that implement LinphonePlayer
*/
public LinphonePlayer createPlayer(AndroidVideoWindowImpl window);
public LinphonePlayer createLocalPlayer(AndroidVideoWindowImpl window);
}

6
java/impl/org/linphone/core/LinphoneCoreImpl.java
View file

@ -1280,10 +1280,10 @@ class LinphoneCoreImpl implements LinphoneCore {
return getFileTransferServer(nativePtr);
}
private native long createPlayer(long nativePtr, AndroidVideoWindowImpl window);
private native long createLocalPlayer(long nativePtr, AndroidVideoWindowImpl window);
@Override
public synchronized LinphonePlayer createPlayer(AndroidVideoWindowImpl window) {
long playerPtr = createPlayer(nativePtr, window);
public synchronized LinphonePlayer createLocalPlayer(AndroidVideoWindowImpl window) {
long playerPtr = createLocalPlayer(nativePtr, window);
if(playerPtr != 0) {
return new LinphonePlayerImpl(playerPtr);
} else {

2
mediastreamer2

@ -1 +1 @@
Subproject commit 73ac0e724ebbd16c3349d460a77c7585d6a294da
Subproject commit 0190b1c34fead09a19bf1eac6ee72e4b408ec94a