Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
32455170
Commit
32455170
authored
Oct 18, 2011
by
Guillaume Beraudo
Browse files
Max calls limit (config, C, exposed to java)
parent
67daaaa1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
0 deletions
+17
-0
coreapi/linphonecore.c
coreapi/linphonecore.c
+6
-0
coreapi/linphonecore.h
coreapi/linphonecore.h
+2
-0
coreapi/linphonecore_jni.cc
coreapi/linphonecore_jni.cc
+5
-0
coreapi/private.h
coreapi/private.h
+1
-0
java/common/org/linphone/core/LinphoneCore.java
java/common/org/linphone/core/LinphoneCore.java
+3
-0
No files found.
coreapi/linphonecore.c
View file @
32455170
...
...
@@ -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
;
...
...
coreapi/linphonecore.h
View file @
32455170
...
...
@@ -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
...
...
coreapi/linphonecore_jni.cc
View file @
32455170
...
...
@@ -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
extern
"C"
jint
Java_org_linphone_core_LinphoneCoreImpl_getMaxCalls
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
pCore
)
{
return
(
jint
)
linphone_core_get_max_calls
((
LinphoneCore
*
)
pCore
);
}
coreapi/private.h
View file @
32455170
...
...
@@ -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
);
...
...
java/common/org/linphone/core/LinphoneCore.java
View file @
32455170
...
...
@@ -621,4 +621,7 @@ public interface LinphoneCore {
void
transferCallToAnother
(
LinphoneCall
callToTransfer
,
LinphoneCall
destination
);
LinphoneCall
findCallFromUri
(
String
uri
);
int
getMaxCalls
();
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment