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
a48296ec
Commit
a48296ec
authored
Feb 15, 2011
by
Guillaume Beraudo
Browse files
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
parents
268b035d
3fbde7c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
coreapi/callbacks.c
View file @
a48296ec
...
...
@@ -235,10 +235,12 @@ static void call_ringing(SalOp *h){
if
(
lc
->
ringstream
!=
NULL
)
return
;
/*already ringing !*/
if
(
lc
->
sound_conf
.
play_sndcard
!=
NULL
){
MSSndCard
*
ringcard
=
lc
->
sound_conf
.
lsd_card
?
lc
->
sound_conf
.
lsd_card
:
lc
->
sound_conf
.
play_sndcard
;
ms_message
(
"Remote ringing..."
);
lc
->
ringstream
=
ring_start
(
lc
->
sound_conf
.
remote_ring
,
2000
,
ringcard
);
linphone_call_set_state
(
call
,
LinphoneCallOutgoingRinging
,
"Remote ringing"
);
}
ms_message
(
"Remote ringing..."
);
if
(
lc
->
vtable
.
display_status
)
lc
->
vtable
.
display_status
(
lc
,
_
(
"Remote ringing..."
));
linphone_call_set_state
(
call
,
LinphoneCallOutgoingRinging
,
"Remote ringing"
);
}
else
{
/*accept early media */
if
(
call
->
audiostream
&&
call
->
audiostream
->
ticker
!=
NULL
){
...
...
mediastreamer2
@
b0eddd4c
Subproject commit b
9a6dad7339175e894d1a0f291ccb5d1143e3199
Subproject commit b
0eddd4c81b5055534aceb0bf85f0eafb6151d42
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