kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 00:41:41 +00:00
Code Issues Projects Releases Wiki Activity

FS-4177 play-file-done was not previously possible it was part of supressing play-file, try this patch

Browse Source
This commit is contained in:
Anthony Minessale 2012-05-07 10:24:08 -05:00
parent b43fa94551
commit f7476320db
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -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
} }
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)
*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")) {