Commit f6d85a81 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Merge branch 'master' of git.linphone.org:linphone

parents 6f3b23e6 cfaa4721
...@@ -4311,7 +4311,9 @@ void linphone_core_stop_dtmf_stream(LinphoneCore* lc) { ...@@ -4311,7 +4311,9 @@ void linphone_core_stop_dtmf_stream(LinphoneCore* lc) {
int linphone_core_get_max_calls(LinphoneCore *lc) { int linphone_core_get_max_calls(LinphoneCore *lc) {
return lc->max_calls; return lc->max_calls;
} }
void linphone_core_set_max_calls(LinphoneCore *lc, int max) {
lc->max_calls=max;
}
typedef struct Hook{ typedef struct Hook{
LinphoneCoreIterateHook fun; LinphoneCoreIterateHook fun;
......
...@@ -1031,6 +1031,8 @@ int linphone_core_terminate_conference(LinphoneCore *lc); ...@@ -1031,6 +1031,8 @@ int linphone_core_terminate_conference(LinphoneCore *lc);
int linphone_core_get_conference_size(LinphoneCore *lc); int linphone_core_get_conference_size(LinphoneCore *lc);
int linphone_core_get_max_calls(LinphoneCore *lc); int linphone_core_get_max_calls(LinphoneCore *lc);
void linphone_core_set_max_calls(LinphoneCore *lc, int max);
bool_t linphone_core_sound_resources_locked(LinphoneCore *lc); bool_t linphone_core_sound_resources_locked(LinphoneCore *lc);
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -1523,3 +1523,6 @@ extern "C" void Java_org_linphone_LinphoneManager_hackSpeakerState(JNIEnv* env, ...@@ -1523,3 +1523,6 @@ extern "C" void Java_org_linphone_LinphoneManager_hackSpeakerState(JNIEnv* env,
extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getMaxCalls(JNIEnv *env,jobject thiz,jlong pCore) { extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getMaxCalls(JNIEnv *env,jobject thiz,jlong pCore) {
return (jint) linphone_core_get_max_calls((LinphoneCore *) pCore); return (jint) linphone_core_get_max_calls((LinphoneCore *) pCore);
} }
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setMaxCalls(JNIEnv *env,jobject thiz,jlong pCore, jint max) {
linphone_core_set_max_calls((LinphoneCore *) pCore, (int) max);
}
...@@ -623,6 +623,7 @@ public interface LinphoneCore { ...@@ -623,6 +623,7 @@ public interface LinphoneCore {
LinphoneCall findCallFromUri(String uri); LinphoneCall findCallFromUri(String uri);
int getMaxCalls(); int getMaxCalls();
void setMaxCalls(int max);
boolean isMyself(String uri); boolean isMyself(String uri);
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment