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
b0729218
Commit
b0729218
authored
Feb 03, 2011
by
Simon Morlat
Browse files
multicall bugfixes again
parent
53859fc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
coreapi/callbacks.c
coreapi/callbacks.c
+15
-3
coreapi/offeranswer.c
coreapi/offeranswer.c
+2
-2
No files found.
coreapi/callbacks.c
View file @
b0729218
...
...
@@ -305,16 +305,28 @@ static void call_accepted(SalOp *op){
linphone_core_update_streams
(
lc
,
call
,
md
);
linphone_call_set_state
(
call
,
LinphoneCallPausedByRemote
,
"Call paused by remote"
);
}
else
{
if
(
lc
->
vtable
.
display_status
){
lc
->
vtable
.
display_status
(
lc
,
_
(
"Call answered - connected."
));
}
if
(
call
->
state
==
LinphoneCallStreamsRunning
){
/*media was running before, the remote as acceted a call modification (that is
a reinvite made by us. We must notify the application this reinvite was accepted*/
linphone_call_set_state
(
call
,
LinphoneCallUpdated
,
"Call updated"
);
}
else
{
if
(
call
->
state
==
LinphoneCallResuming
){
if
(
lc
->
vtable
.
display_status
){
lc
->
vtable
.
display_status
(
lc
,
_
(
"Call resumed."
));
}
}
else
{
if
(
lc
->
vtable
.
display_status
){
char
*
tmp
=
linphone_call_get_remote_address_as_string
(
call
);
char
*
msg
=
ms_strdup_printf
(
_
(
"Call answered by %s."
),
tmp
);
lc
->
vtable
.
display_status
(
lc
,
msg
);
ms_free
(
tmp
);
ms_free
(
msg
);
}
}
}
linphone_core_update_streams
(
lc
,
call
,
md
);
linphone_call_set_state
(
call
,
LinphoneCallStreamsRunning
,
"Streams running"
);
lc
->
current_call
=
call
;
}
}
else
{
/*send a bye*/
...
...
coreapi/offeranswer.c
View file @
b0729218
...
...
@@ -129,9 +129,9 @@ static SalStreamDir compute_dir_incoming(SalStreamDir local, SalStreamDir offere
if
(
local
==
SalStreamSendRecv
){
if
(
offered
==
SalStreamSendOnly
)
res
=
SalStreamRecvOnly
;
if
(
offered
==
SalStreamRecvOnly
)
else
if
(
offered
==
SalStreamRecvOnly
)
res
=
SalStreamSendOnly
;
if
(
offered
==
SalStreamInactive
)
else
if
(
offered
==
SalStreamInactive
)
res
=
SalStreamInactive
;
else
res
=
SalStreamSendRecv
;
...
...
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