mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-02-08 08:51:50 +00:00
Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
This commit is contained in:
commit
d46b6cd48b
@ -171,8 +171,10 @@ switch_status_t megaco_activate_termination(mg_termination_t *term)
|
|||||||
switch_channel_set_private(channel, PVT_MG_TERM, term);
|
switch_channel_set_private(channel, PVT_MG_TERM, term);
|
||||||
switch_core_event_hook_add_recv_dtmf(session, mg_on_dtmf);
|
switch_core_event_hook_add_recv_dtmf(session, mg_on_dtmf);
|
||||||
|
|
||||||
|
if (term->type == MG_TERM_TDM) {
|
||||||
switch_core_session_execute_application_async(session, "spandsp_start_fax_detect", "mg_notify cng 120 cng");
|
switch_core_session_execute_application_async(session, "spandsp_start_fax_detect", "mg_notify cng 120 cng");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch_set_flag(term, MGT_ACTIVE);
|
switch_set_flag(term, MGT_ACTIVE);
|
||||||
|
|
||||||
|
@ -476,7 +476,7 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
|
|||||||
rate,
|
rate,
|
||||||
ptime,
|
ptime,
|
||||||
1,
|
1,
|
||||||
/*SWITCH_CODEC_FLAG_ENCODE |*/ SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
|
||||||
goto fail;
|
goto fail;
|
||||||
@ -487,7 +487,7 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
|
|||||||
rate,
|
rate,
|
||||||
ptime,
|
ptime,
|
||||||
1,
|
1,
|
||||||
SWITCH_CODEC_FLAG_ENCODE /*| SWITCH_CODEC_FLAG_DECODE*/,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
|
||||||
goto fail;
|
goto fail;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user