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

Update mediastreamer

Browse source
This commit is contained in:
Erwan Croze 2016-08-19 11:20:17 +02:00
parent 3a1dacbdf4
commit 1d1c196ead
6 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coreapi/linphonecore.c
View file

@ -4804,6 +4804,12 @@ const char** linphone_core_get_video_devices(const LinphoneCore *lc){
return lc->video_conf.cams;
}
void linphone_core_set_default_sound_devices(LinphoneCore *lc){
linphone_core_set_ringer_device(lc, NULL);
linphone_core_set_playback_device(lc, NULL);
linphone_core_set_capture_device(lc, NULL);
}
void linphone_core_reload_sound_devices(LinphoneCore *lc){
const char *ringer;
const char *playback;

5
coreapi/linphonecore.h
View file

@ -3265,6 +3265,11 @@ LINPHONE_PUBLIC LinphoneNatPolicy * linphone_core_get_nat_policy(const LinphoneC
/* returns a null terminated static array of string describing the sound devices */
LINPHONE_PUBLIC const char** linphone_core_get_sound_devices(LinphoneCore *lc);
/**
* Use this function when you want to set the default sound devices
**/
LINPHONE_PUBLIC void linphone_core_set_default_sound_devices(LinphoneCore *lc);
/**
* Update detection of sound devices.
*

11
coreapi/linphonecore_jni.cc
View file

@ -2457,6 +2457,13 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isKeepAliveEnabled(J
return (jboolean)linphone_core_keep_alive_enabled((LinphoneCore*)lc);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDefaultSoundDevices(JNIEnv* env
,jobject thiz
,jlong lc) {
linphone_core_set_default_sound_devices((LinphoneCore*)lc);
}
extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNIEnv* env
,jobject thiz
,jlong lc
@ -2467,7 +2474,6 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNI
linphone_core_v_table_set_user_data(vTable, ldata);
return (jint)linphone_core_start_echo_calibration((LinphoneCore*)lc, ldata->ecCalibrationStatus, NULL, NULL, vTable);
}
extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_needsEchoCalibration(JNIEnv *env, jobject thiz, jlong lcptr) {
@ -7595,6 +7601,9 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_reloadMsPlugins(J
ReleaseStringUTFChars(env, jpath, path);
}
JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_reloadSoundDevices(JNIEnv *env, jobject jobj, jlong pcore) {
linphone_core_reload_sound_devices((LinphoneCore*)pcore);
}
JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_getCore(JNIEnv *env, jobject thiz, jlong jNatPolicy) {
LinphoneCore *lc = ((LinphoneNatPolicy *)jNatPolicy)->lc;

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

@ -2395,6 +2395,14 @@ public interface LinphoneCore {
* @param path The path from where plugins are to be loaded.
**/
public void reloadMsPlugins(String path);
/**
* Reload sound devices.
* Use it if you change the devices table.
*/
public void reloadSoundDevices();
public void setDefaultSoundDevices();
public boolean isLimeEncryptionAvailable();

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

@ -187,6 +187,8 @@ class LinphoneCoreImpl implements LinphoneCore {
private native void setAndroidWifiLock(long nativePtr,Object wifi_lock);
private native void setAndroidMulticastLock(long nativePtr,Object multicast_lock);
private native void reloadMsPlugins(long nativePtr, String path);
private native void reloadSoundDevices(long nativePtr);
private native void setDefaultSoundDevices(long nativePtr);
LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig, File factoryConfig, Object userdata) throws IOException {
mListener = listener;
@ -1696,6 +1698,14 @@ class LinphoneCoreImpl implements LinphoneCore {
public void reloadMsPlugins(String path) {
reloadMsPlugins(nativePtr, path);
}
public void reloadSoundDevices() {
reloadSoundDevices(nativePtr);
}
public void setDefaultSoundDevices() {
setDefaultSoundDevices(nativePtr);
}
private native boolean isLimeEncryptionAvailable(long nativePtr);
public synchronized boolean isLimeEncryptionAvailable() {

2
mediastreamer2

@ -1 +1 @@
Subproject commit 39ebebd61d8f63ecbaad03bcefe992e834bfdcaa
Subproject commit 110e3cf018187903b5638199831a43f6e9d7a021