Max calls limit (config, C, exposed to java)

This commit is contained in:
Guillaume Beraudo 2011-10-18 15:41:04 +02:00
parent 67daaaa14d
commit 324551708e
5 changed files with 18 additions and 1 deletions

View file

@ -973,6 +973,7 @@ void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const
static void misc_config_read (LinphoneCore *lc) {
LpConfig *config=lc->config;
lc->max_call_logs=lp_config_get_int(config,"misc","history_max_size",15);
lc->max_calls=lp_config_get_int(config,"misc","max_calls",NB_MAX_CALLS);
}
static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vtable, const char *config_path,
@ -4300,6 +4301,11 @@ void linphone_core_stop_dtmf_stream(LinphoneCore* lc) {
lc->ringstream=NULL;
}
int linphone_core_get_max_calls(LinphoneCore *lc) {
return lc->max_calls;
}
typedef struct Hook{
LinphoneCoreIterateHook fun;
void *data;

View file

@ -1030,6 +1030,8 @@ float linphone_core_get_conference_local_input_volume(LinphoneCore *lc);
int linphone_core_terminate_conference(LinphoneCore *lc);
int linphone_core_get_conference_size(LinphoneCore *lc);
int linphone_core_get_max_calls(LinphoneCore *lc);
#ifdef __cplusplus
}
#endif

View file

@ -1506,5 +1506,10 @@ extern "C" void msandroid_hack_speaker_state(bool speakerOn);
extern "C" void Java_org_linphone_LinphoneManager_hackSpeakerState(JNIEnv* env,jobject thiz,jboolean speakerOn){
msandroid_hack_speaker_state(speakerOn);
// End Galaxy S hack functions
}
// End Galaxy S hack functions
extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getMaxCalls(JNIEnv *env,jobject thiz,jlong pCore) {
return (jint) linphone_core_get_max_calls((LinphoneCore *) pCore);
}

View file

@ -467,6 +467,7 @@ struct _LinphoneCore
bool_t use_preview_window;
int device_rotation;
bool_t ringstream_autorelease;
int max_calls;
};
bool_t linphone_core_can_we_add_call(LinphoneCore *lc);

View file

@ -621,4 +621,7 @@ public interface LinphoneCore {
void transferCallToAnother(LinphoneCall callToTransfer, LinphoneCall destination);
LinphoneCall findCallFromUri(String uri);
int getMaxCalls();
}