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

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

Browse source
This commit is contained in:
Sylvain Berfini 2011-11-03 16:50:31 +01:00
commit f6d85a81c2
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/linphonecore.c
View file

@ -4311,7 +4311,9 @@ void linphone_core_stop_dtmf_stream(LinphoneCore* lc) {
int linphone_core_get_max_calls(LinphoneCore *lc) {
return lc->max_calls;
}
void linphone_core_set_max_calls(LinphoneCore *lc, int max) {
lc->max_calls=max;
}
typedef struct Hook{
LinphoneCoreIterateHook fun;

2
coreapi/linphonecore.h
View file

@ -1031,6 +1031,8 @@ int linphone_core_terminate_conference(LinphoneCore *lc);
int linphone_core_get_conference_size(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);
#ifdef __cplusplus

3
coreapi/linphonecore_jni.cc
View file

@ -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) {
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);
}

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

@ -623,6 +623,7 @@ public interface LinphoneCore {
LinphoneCall findCallFromUri(String uri);
int getMaxCalls();
void setMaxCalls(int max);
boolean isMyself(String uri);
/**