fix gremlins in code that worked before then changed it's mind

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3300 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2006-11-10 08:13:01 +00:00
1 parent 964e2e9886
commit 8dc1556b95
6 files changed
+77 -43

No files matched your search

@@ -287,8 +287,16 @@ static switch_status_t uuid_broadcast_function(char *cmd, switch_core_session_t
} else {
switch_media_flag_t flags = SMF_NONE;
if (argv[2] && !strcmp(argv[2], "both")) {
flags |= SMF_ECHO_BRIDGED;
if (argv[2]) {
if (!strcmp(argv[2], "both")) {
flags |= (SMF_ECHO_ALEG | SMF_ECHO_BLEG);
} else if (!strcmp(argv[2], "aleg")) {
flags |= SMF_ECHO_ALEG;
} else if (!strcmp(argv[2], "bleg")) {
flags |= SMF_ECHO_BLEG;
}
} else {
flags |= SMF_ECHO_ALEG;
}
status = switch_ivr_broadcast(argv[0], argv[1], flags);
@@ -111,7 +111,6 @@ static void playback_function(switch_core_session_t *session, char *data)
switch_channel_t *channel;
char *timer_name = NULL;
char *file_name = NULL;
switch_status_t status;
file_name = switch_core_session_strdup(session, data);
@@ -124,12 +123,8 @@ static void playback_function(switch_core_session_t *session, char *data)
switch_channel_pre_answer(channel);
status = switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0);
switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0);
if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) {
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
}
}