witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

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

Browse source
This commit is contained in:
Simon Morlat 2011-11-04 10:32:28 +01:00
commit 527d6cfdef
6 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,6 +1,6 @@
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_CONFIG_SRCDIR([coreapi/linphonecore.c])

4
coreapi/linphonecore.c
View file

@ -4316,7 +4316,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

@ -1037,6 +1037,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);
bool_t linphone_core_media_encryption_supported(const LinphoneCore *lc, LinphoneMediaEncryption menc);

3
coreapi/linphonecore_jni.cc
View file

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

2
coreapi/lpconfig.c
View file

@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define MAX_LEN 4096
#define MAX_LEN 16384
#include "linphonecore.h"

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);
/**