mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-23 11:36:09 +00:00
FSCORE-424
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14702 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
0e9e0fae2e
commit
32bcc886b1
@ -39,6 +39,8 @@ static switch_status_t originate_on_consume_media_transmit(switch_core_session_t
|
|||||||
{
|
{
|
||||||
switch_channel_t *channel = switch_core_session_get_channel(session);
|
switch_channel_t *channel = switch_core_session_get_channel(session);
|
||||||
|
|
||||||
|
/* testing out not using this, we probably don't need it anymore now that we have audio sync */
|
||||||
|
#if 0
|
||||||
if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) {
|
if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) {
|
||||||
while (switch_channel_get_state(channel) == CS_CONSUME_MEDIA && !switch_channel_test_flag(channel, CF_TAGGED)) {
|
while (switch_channel_get_state(channel) == CS_CONSUME_MEDIA && !switch_channel_test_flag(channel, CF_TAGGED)) {
|
||||||
if (!switch_channel_media_ready(channel)) {
|
if (!switch_channel_media_ready(channel)) {
|
||||||
@ -48,6 +50,7 @@ static switch_status_t originate_on_consume_media_transmit(switch_core_session_t
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
switch_channel_clear_state_handler(channel, &originate_state_handlers);
|
switch_channel_clear_state_handler(channel, &originate_state_handlers);
|
||||||
|
|
||||||
@ -525,7 +528,7 @@ static uint8_t check_channel_status(originate_global_t *oglobals, originate_stat
|
|||||||
if (!switch_strlen_zero(oglobals->file)) {
|
if (!switch_strlen_zero(oglobals->file)) {
|
||||||
collect->file = switch_core_session_strdup(originate_status[i].peer_session, oglobals->file);
|
collect->file = switch_core_session_strdup(originate_status[i].peer_session, oglobals->file);
|
||||||
}
|
}
|
||||||
|
switch_channel_audio_sync(originate_status[i].peer_channel);
|
||||||
collect->session = originate_status[i].peer_session;
|
collect->session = originate_status[i].peer_session;
|
||||||
launch_collect_thread(collect);
|
launch_collect_thread(collect);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user