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

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Browse source
This commit is contained in:
Guillaume Beraudo 2010-11-12 10:29:23 +01:00
commit a6819a4d98
4 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
coreapi/linphonecore_jni.cc
View file

@ -303,8 +303,8 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
,jstring jfactoryConfig
,jobject juserdata){
const char* userConfig = env->GetStringUTFChars(juserConfig, NULL);
const char* factoryConfig = env->GetStringUTFChars(jfactoryConfig, NULL);
const char* userConfig = juserConfig?env->GetStringUTFChars(juserConfig, NULL):NULL;
const char* factoryConfig = jfactoryConfig?env->GetStringUTFChars(jfactoryConfig, NULL):NULL;
LinphoneCoreData* ldata = new LinphoneCoreData(env,thiz,jlistener,juserdata);
#ifdef ANDROID
ms_andsnd_set_jvm(jvm);
@ -322,8 +322,8 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
//clear existing proxy config
linphone_core_clear_proxy_config((LinphoneCore*) nativePtr);
env->ReleaseStringUTFChars(juserConfig, userConfig);
env->ReleaseStringUTFChars(jfactoryConfig, factoryConfig);
if (userConfig) env->ReleaseStringUTFChars(juserConfig, userConfig);
if (factoryConfig) env->ReleaseStringUTFChars(jfactoryConfig, factoryConfig);
return nativePtr;
}
extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_delete(JNIEnv* env
@ -567,6 +567,20 @@ extern "C" long Java_org_linphone_core_LinphoneCoreImpl_createChatRoom(JNIEnv*
return (long)lResult;
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_enableVideo(JNIEnv* env
,jobject thiz
,jlong lc
,jboolean vcap_enabled
,jboolean display_enabled) {
linphone_core_enable_video((LinphoneCore*)lc, vcap_enabled,display_enabled);
}
extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isVideoEnabled(JNIEnv* env
,jobject thiz
,jlong lc) {
return linphone_core_video_enabled((LinphoneCore*)lc);
}
//ProxyConfig
extern "C" jlong Java_org_linphone_core_LinphoneProxyConfigImpl_newLinphoneProxyConfig(JNIEnv* env,jobject thiz) {

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

@ -372,6 +372,24 @@ public interface LinphoneCore {
*/
LinphoneChatRoom createChatRoom(String to);
public void setVideoWindow(VideoWindow w);
public void setPreviewWindow(VideoWindow w);
public void setVideoWindow(Object w);
public void setPreviewWindow(Object w);
/**
* Enables video globally.
*
*
* This function does not have any effect during calls. It just indicates #LinphoneCore to
* initiate future calls with video or not. The two boolean parameters indicate in which
* direction video is enabled. Setting both to false disables video entirely.
*
* @param vcap_enabled indicates whether video capture is enabled
* @param display_enabled indicates whether video display should be shown
*
**/
void enableVideo(boolean vcap_enabled, boolean display_enabled);
/**
* Returns TRUE if video is enabled, FALSE otherwise.
*
***/
boolean isVideoEnabled();
}

5
java/common/org/linphone/core/VideoWindow.java
View file

@ -1,5 +0,0 @@
package org.linphone.core;
public interface VideoWindow {
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit ffacf56718c198cb80a290f7a65975916d8a9b6b
Subproject commit e59157a44a7b6aa1f1fa756325047e98c2be3786