提交 890b558c authored 作者: Mike Jerris's avatar Mike Jerris

Merge pull request #1505 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-11100 to master

* commit '320f7d6b':
  FS-11100 [mod_conference] export variables for conference_outcall_bg
...@@ -1332,6 +1332,10 @@ void conference_loop_output(conference_member_t *member) ...@@ -1332,6 +1332,10 @@ void conference_loop_output(conference_member_t *member)
int to = 60; int to = 60;
int wait_sec = 2; int wait_sec = 2;
int loops = 0; int loops = 0;
switch_event_t *var_event;
switch_event_create(&var_event, SWITCH_EVENT_CHANNEL_DATA);
switch_channel_process_export(channel, NULL, var_event, "conference_auto_outcall_export_vars");
if (ann && !switch_channel_test_app_flag_key("conference_silent", channel, CONF_SILENT_REQ)) { if (ann && !switch_channel_test_app_flag_key("conference_silent", channel, CONF_SILENT_REQ)) {
member->conference->special_announce = switch_core_strdup(member->conference->pool, ann); member->conference->special_announce = switch_core_strdup(member->conference->pool, ann);
...@@ -1363,9 +1367,11 @@ void conference_loop_output(conference_member_t *member) ...@@ -1363,9 +1367,11 @@ void conference_loop_output(conference_member_t *member)
} }
for (x = 0; x < argc; x++) { for (x = 0; x < argc; x++) {
char *dial_str = switch_mprintf("%s%s", switch_str_nil(prefix), argv[x]); char *dial_str = switch_mprintf("%s%s", switch_str_nil(prefix), argv[x]);
switch_event_t *event = NULL;
switch_event_dup(&event, var_event);
switch_assert(dial_str); switch_assert(dial_str);
conference_outcall_bg(member->conference, NULL, NULL, dial_str, to, switch_str_nil(flags), cid_name, cid_num, NULL, conference_outcall_bg(member->conference, NULL, NULL, dial_str, to, switch_str_nil(flags), cid_name, cid_num, NULL,
profile, &member->conference->cancel_cause, NULL); profile, &member->conference->cancel_cause, &event);
switch_safe_free(dial_str); switch_safe_free(dial_str);
} }
switch_safe_free(cpstr); switch_safe_free(cpstr);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论