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
b44b872e
Commit
b44b872e
authored
Jan 22, 2016
by
François Grisez
Browse files
Prevents the conference server to be added to the list of participants
parent
bd667fb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
coreapi/conference.cc
View file @
b44b872e
...
...
@@ -89,7 +89,7 @@ public:
virtual
void
onCallTerminating
(
LinphoneCall
*
call
)
{};
protected:
Participant
*
find
_p
articipant
(
const
LinphoneAddress
*
uri
);
const
Participant
*
find
P
articipant
(
const
LinphoneAddress
*
uri
)
const
;
LinphoneCore
*
m_core
;
AudioStream
*
m_localParticipantStream
;
...
...
@@ -234,7 +234,7 @@ int Conference::removeParticipant(LinphoneCall *call) {
}
int
Conference
::
removeParticipant
(
const
LinphoneAddress
*
uri
)
{
Participant
*
participant
=
find
_p
articipant
(
uri
);
const
Participant
*
participant
=
find
P
articipant
(
uri
);
if
(
participant
==
NULL
)
return
-
1
;
LinphoneCall
*
call
=
participant
->
getCall
();
if
(
call
)
call
->
conf_ref
=
NULL
;
...
...
@@ -266,8 +266,8 @@ float Conference::getInputVolume() const {
return
LINPHONE_VOLUME_DB_LOWEST
;
}
Participant
*
Conference
::
find
_p
articipant
(
const
LinphoneAddress
*
uri
)
{
list
<
Participant
>::
iterator
it
=
m_participants
.
begin
();
const
Participant
*
Conference
::
find
P
articipant
(
const
LinphoneAddress
*
uri
)
const
{
list
<
Participant
>::
const_
iterator
it
=
m_participants
.
begin
();
while
(
it
!=
m_participants
.
end
())
{
if
(
linphone_address_equal
(
uri
,
it
->
getUri
()))
break
;
it
++
;
...
...
@@ -452,7 +452,7 @@ int LocalConference::removeParticipant(LinphoneCall *call) {
}
int
LocalConference
::
removeParticipant
(
const
LinphoneAddress
*
uri
)
{
Participant
*
participant
=
find
_p
articipant
(
uri
);
const
Participant
*
participant
=
find
P
articipant
(
uri
);
if
(
participant
==
NULL
)
return
-
1
;
LinphoneCall
*
call
=
participant
->
getCall
();
if
(
call
==
NULL
)
return
-
1
;
...
...
@@ -608,10 +608,10 @@ int RemoteConference::addParticipant(LinphoneCall *call) {
params
=
linphone_core_create_call_params
(
m_core
,
NULL
);
linphone_call_params_enable_video
(
params
,
m_currentParams
.
videoRequested
());
m_focusCall
=
linphone_call_ref
(
linphone_core_invite_address_with_params
(
m_core
,
addr
,
params
));
m_focusCall
->
conf_ref
=
(
LinphoneConference
*
)
this
;
m_localParticipantStream
=
m_focusCall
->
audiostream
;
m_pendingCalls
=
ms_list_append
(
m_pendingCalls
,
linphone_call_ref
(
call
));
m_state
=
ConnectingToFocus
;
call
->
conf_ref
=
(
LinphoneConference
*
)
this
;
LinphoneCallLog
*
callLog
=
linphone_call_get_call_log
(
m_focusCall
);
callLog
->
was_conference
=
TRUE
;
linphone_address_unref
(
addr
);
...
...
coreapi/linphonecore.c
View file @
b44b872e
...
...
@@ -7437,7 +7437,9 @@ int linphone_core_add_all_to_conference(LinphoneCore *lc) {
while
(
calls
)
{
LinphoneCall
*
call
=
(
LinphoneCall
*
)
calls
->
data
;
calls
=
calls
->
next
;
linphone_core_add_to_conference
(
lc
,
call
);
if
(
linphone_call_get_conference
(
call
)
==
NULL
)
{
// Prevent the call to the conference server from being added to the conference
linphone_core_add_to_conference
(
lc
,
call
);
}
}
if
(
lc
->
conf_ctx
&&
linphone_conference_check_class
(
lc
->
conf_ctx
,
LinphoneConferenceClassLocal
))
{
linphone_core_enter_conference
(
lc
);
...
...
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