Commit 527d6cfd authored by Simon Morlat's avatar Simon Morlat
Browse files

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

parents 263b1031 f6d85a81
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT([linphone],[3.4.99.3],[linphone-developers@nongnu.org]) AC_INIT([linphone],[3.4.99.4],[linphone-developers@nongnu.org])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([coreapi/linphonecore.c]) AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
......
...@@ -4316,7 +4316,9 @@ void linphone_core_stop_dtmf_stream(LinphoneCore* lc) { ...@@ -4316,7 +4316,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;
......
...@@ -1037,6 +1037,8 @@ int linphone_core_terminate_conference(LinphoneCore *lc); ...@@ -1037,6 +1037,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);
bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, LinphoneMediaEncryption menc); bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, LinphoneMediaEncryption menc);
......
...@@ -1598,3 +1598,6 @@ extern "C" void Java_org_linphone_LinphoneManager_hackSpeakerState(JNIEnv* env, ...@@ -1598,3 +1598,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);
}
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#define MAX_LEN 4096 #define MAX_LEN 16384
#include "linphonecore.h" #include "linphonecore.h"
......
...@@ -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