Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Commits
a48296ec
Commit
a48296ec
authored
14 years ago
by
Guillaume Beraudo
Browse files
Options
Download
Plain Diff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
parents
268b035d
3fbde7c8
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
coreapi/callbacks.c
+4
-2
coreapi/callbacks.c
mediastreamer2
+1
-1
mediastreamer2
with
5 additions
and
3 deletions
coreapi/callbacks.c
+
4
−
2
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
){
...
...
This diff is collapsed.
Click to expand it.
mediastreamer2
@
b0eddd4c
Subproject commit b
9a6dad7339175e894d1a0f291ccb5d1143e3199
Subproject commit b
0eddd4c81b5055534aceb0bf85f0eafb6151d42
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets