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
fc9dc609
Commit
fc9dc609
authored
Jan 14, 2016
by
François Grisez
Browse files
Add a method to LinphoneCallLog to check whether a call was a call to a conference server
parent
454e9834
Changes
7
Hide whitespace changes
Inline
Side-by-side
coreapi/call_log.c
View file @
fc9dc609
...
...
@@ -248,6 +248,10 @@ bool_t linphone_call_log_video_enabled(LinphoneCallLog *cl) {
return
cl
->
video_enabled
;
}
bool_t
linphone_call_log_was_conference
(
LinphoneCallLog
*
cl
)
{
return
cl
->
was_conference
;
}
/*******************************************************************************
* Reference and user data handling functions *
...
...
coreapi/call_log.h
View file @
fc9dc609
...
...
@@ -179,6 +179,13 @@ LINPHONE_PUBLIC bool_t linphone_call_log_video_enabled(LinphoneCallLog *cl);
**/
LINPHONE_PUBLIC
char
*
linphone_call_log_to_str
(
LinphoneCallLog
*
cl
);
/**
* Tells whether that call was a call to a conference server
* @param[in] cl #LinphoneCallLog object
* @return TRUE if the call was a call to a conference server
*/
LINPHONE_PUBLIC
bool_t
linphone_call_log_was_conference
(
LinphoneCallLog
*
cl
);
/*******************************************************************************
* Reference and user data handling functions *
...
...
coreapi/conference.cc
View file @
fc9dc609
...
...
@@ -611,8 +611,10 @@ int RemoteConference::addParticipant(LinphoneCall *call) {
m_localParticipantStream
=
m_focusCall
->
audiostream
;
m_pendingCalls
=
ms_list_append
(
m_pendingCalls
,
linphone_call_ref
(
call
));
m_state
=
ConnectingToFocus
;
linphone_address_unref
(
addr
);
call
->
conf_ref
=
(
LinphoneConference
*
)
this
;
LinphoneCallLog
*
callLog
=
linphone_call_get_call_log
(
m_focusCall
);
callLog
->
was_conference
=
TRUE
;
linphone_address_unref
(
addr
);
linphone_call_params_unref
(
params
);
return
0
;
}
else
return
-
1
;
...
...
coreapi/linphonecore_jni.cc
View file @
fc9dc609
...
...
@@ -2790,6 +2790,10 @@ extern "C" jint Java_org_linphone_core_LinphoneCallLogImpl_getCallDuration(JNIEn
return
(
jint
)((
LinphoneCallLog
*
)
ptr
)
->
duration
;
}
extern
"C"
jboolean
Java_org_linphone_core_LinphoneCallLogImpl_wasConference
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
ptr
)
{
return
linphone_call_log_was_conference
((
LinphoneCallLog
*
)
ptr
);
}
/* CallStats */
extern
"C"
jint
Java_org_linphone_core_LinphoneCallStatsImpl_getMediaType
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
stats_ptr
)
{
return
(
jint
)((
LinphoneCallStats
*
)
stats_ptr
)
->
type
;
...
...
coreapi/private.h
View file @
fc9dc609
...
...
@@ -194,6 +194,7 @@ struct _LinphoneCallLog{
char
*
call_id
;
/**unique id of a call*/
struct
_LinphoneQualityReporting
reporting
;
bool_t
video_enabled
;
bool_t
was_conference
;
/**<That call was a call with a conference server */
unsigned
int
storage_id
;
};
...
...
java/common/org/linphone/core/LinphoneCallLog.java
View file @
fc9dc609
...
...
@@ -121,4 +121,9 @@ public interface LinphoneCallLog {
* @return the SIP call-id.
*/
public
String
getCallId
();
/**
* Tells whether the call was a call to a conference server
* @return true if the call was a call to a conference server
*/
public
boolean
wasConference
();
}
java/impl/org/linphone/core/LinphoneCallLogImpl.java
View file @
fc9dc609
...
...
@@ -31,6 +31,7 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
private
native
int
getCallDuration
(
long
nativePtr
);
private
native
String
getCallId
(
long
nativePtr
);
private
native
long
getTimestamp
(
long
nativePtr
);
private
native
boolean
wasConference
(
long
nativePtr
);
LinphoneCallLogImpl
(
long
aNativePtr
)
{
nativePtr
=
aNativePtr
;
...
...
@@ -69,4 +70,7 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
public
long
getTimestamp
()
{
return
getTimestamp
(
nativePtr
)
*
1000
;
// Need milliseconds, not seconds
}
public
boolean
wasConference
()
{
return
wasConference
(
nativePtr
);
}
}
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