提交 f7476320 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-4177 play-file-done was not previously possible it was part of supressing…

FS-4177 play-file-done was not previously possible it was part of supressing play-file, try this patch
上级 b43fa945
...@@ -217,7 +217,8 @@ typedef enum { ...@@ -217,7 +217,8 @@ typedef enum {
EFLAG_FLOOR_CHANGE = (1 << 25), EFLAG_FLOOR_CHANGE = (1 << 25),
EFLAG_MUTE_DETECT = (1 << 26), EFLAG_MUTE_DETECT = (1 << 26),
EFLAG_RECORD = (1 << 27), EFLAG_RECORD = (1 << 27),
EFLAG_HUP_MEMBER = (1 << 28) EFLAG_HUP_MEMBER = (1 << 28),
EFLAG_PLAY_FILE_DONE = (1 << 29),
} event_type_t; } event_type_t;
typedef struct conference_file_node { typedef struct conference_file_node {
...@@ -1621,7 +1622,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v ...@@ -1621,7 +1622,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
} }
if (file_sample_len <= 0) { if (file_sample_len <= 0) {
if (test_eflag(conference, EFLAG_PLAY_FILE) && if (test_eflag(conference, EFLAG_PLAY_FILE_DONE) &&
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
conference_add_event_data(conference, event); conference_add_event_data(conference, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "play-file-done");
...@@ -6107,6 +6108,8 @@ static void clear_eflags(char *events, uint32_t *f) ...@@ -6107,6 +6108,8 @@ static void clear_eflags(char *events, uint32_t *f)
*f &= ~EFLAG_VOLUME_OUT_MEMBER; *f &= ~EFLAG_VOLUME_OUT_MEMBER;
} else if (!strcmp(event, "play-file")) { } else if (!strcmp(event, "play-file")) {
*f &= ~EFLAG_PLAY_FILE; *f &= ~EFLAG_PLAY_FILE;
} else if (!strcmp(event, "play-file-done")) {
*f &= ~EFLAG_PLAY_FILE;
} else if (!strcmp(event, "play-file-member")) { } else if (!strcmp(event, "play-file-member")) {
*f &= ~EFLAG_PLAY_FILE_MEMBER; *f &= ~EFLAG_PLAY_FILE_MEMBER;
} else if (!strcmp(event, "speak-text")) { } else if (!strcmp(event, "speak-text")) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论