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
4bc82605
Commit
4bc82605
authored
Sep 22, 2017
by
Benjamin REIS
Browse files
cast away
parent
a568f332
Changes
2
Hide whitespace changes
Inline
Side-by-side
coreapi/linphonecore.c
View file @
4bc82605
...
...
@@ -5518,11 +5518,11 @@ static MSFilter *get_audio_resource(LinphoneCore *lc, LinphoneAudioResourceType
ringstream
=
lc
->
ringstream
=
ring_start
(
lc
->
factory
,
NULL
,
0
,
ringcard
);
ms_filter_call_method
(
lc
->
ringstream
->
gendtmf
,
MS_DTMF_GEN_SET_DEFAULT_AMPLITUDE
,
&
amp
);
lc
->
dmfs_playing_start_time
=
ms_get_cur_time_ms
()
/
1000
;
lc
->
dmfs_playing_start_time
=
(
time_t
)
ms_get_cur_time_ms
()
/
1000
;
}
else
{
ringstream
=
lc
->
ringstream
;
if
(
lc
->
dmfs_playing_start_time
!=
0
)
lc
->
dmfs_playing_start_time
=
ms_get_cur_time_ms
()
/
1000
;
lc
->
dmfs_playing_start_time
=
(
time_t
)
ms_get_cur_time_ms
()
/
1000
;
}
if
(
rtype
==
LinphoneToneGenerator
)
return
ringstream
->
gendtmf
;
if
(
rtype
==
LinphoneLocalPlayer
)
return
ringstream
->
source
;
...
...
coreapi/ringtoneplayer_ios.m
View file @
4bc82605
...
...
@@ -77,7 +77,7 @@ int linphone_ringtoneplayer_ios_start_with_cb(LinphoneRingtonePlayer* rp, const
}
bool_t
linphone_ringtoneplayer_ios_is_started
(
LinphoneRingtonePlayer
*
rp
)
{
return
[
rp
->
player
isPlaying
];
return
(
bool_t
)
[
rp
->
player
isPlaying
];
}
int
linphone_ringtoneplayer_ios_stop
(
LinphoneRingtonePlayer
*
rp
)
{
...
...
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