kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-15 11:29:56 +00:00
Code Issues Projects Releases Wiki Activity

add sync param to sleep so you can choose to sync audio or not on sleep (reswig to follow)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10693 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-12-10 00:48:24 +00:00
parent 0e60a19e77
commit 71054917ac
12 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_cpp.h
View File

@ -313,7 +313,7 @@ SWITCH_DECLARE(void) consoleCleanLog(char *msg);
* *
*/ */
SWITCH_DECLARE(int) streamFile(char *file, int starting_sample_count = 0); SWITCH_DECLARE(int) streamFile(char *file, int starting_sample_count = 0);
SWITCH_DECLARE(int) sleep(int ms); SWITCH_DECLARE(int) sleep(int ms, int sync=0);
/** \brief flush any pending events /** \brief flush any pending events
*/ */

2
src/include/switch_ivr.h
View File

@ -110,7 +110,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_next_event(switch_core_session_
\param args arguements to pass for callbacks etc \param args arguements to pass for callbacks etc
\return SWITCH_STATUS_SUCCESS if the channel is still up \return SWITCH_STATUS_SUCCESS if the channel is still up
*/ */
SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_input_args_t *args); SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_bool_t sync, switch_input_args_t *args);
SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session, switch_input_args_t *args); SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session, switch_input_args_t *args);

2
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -1307,7 +1307,7 @@ SWITCH_STANDARD_APP(sleep_function)
switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" );
switch_ivr_sleep(session, ms, &args); switch_ivr_sleep(session, ms, SWITCH_TRUE, &args);
} }
} }

2
src/mod/applications/mod_fax/mod_fax.c
View File

@ -608,7 +608,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
goto done; goto done;
} }
switch_ivr_sleep(session, 250, NULL); switch_ivr_sleep(session, 250, SWITCH_TRUE, NULL);
while (switch_channel_ready(channel)) { while (switch_channel_ready(channel)) {
int tx = 0; int tx = 0;

2
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -1167,7 +1167,7 @@ SWITCH_STANDARD_APP(fifo_function)
if (announce) { if (announce) {
switch_ivr_play_file(session, NULL, announce, NULL); switch_ivr_play_file(session, NULL, announce, NULL);
} else { } else {
switch_ivr_sleep(session, 500, NULL); switch_ivr_sleep(session, 500, SWITCH_TRUE, NULL);
} }
switch_channel_set_variable(other_channel, "fifo_serviced_by", my_id); switch_channel_set_variable(other_channel, "fifo_serviced_by", my_id);

4
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -1403,7 +1403,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
forward_file_path = switch_core_session_sprintf(session, "%s%smsg_%s.wav", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, uuid_str); forward_file_path = switch_core_session_sprintf(session, "%s%smsg_%s.wav", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, uuid_str);
TRY_CODE(create_file(session, profile, VM_RECORD_MESSAGE_MACRO, forward_file_path, &message_len, SWITCH_TRUE, NULL, NULL)); TRY_CODE(create_file(session, profile, VM_RECORD_MESSAGE_MACRO, forward_file_path, &message_len, SWITCH_TRUE, NULL, NULL));
if ((new_path = vm_merge_file(session, profile, forward_file_path, cbt->file_path))) { if ((new_path = vm_merge_file(session, profile, forward_file_path, cbt->file_path))) {
switch_ivr_sleep(session, 1500, NULL); switch_ivr_sleep(session, 1500, SWITCH_TRUE, NULL);
forward_file_path = new_path; forward_file_path = new_path;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error merging files\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error merging files\n");
@ -1637,7 +1637,7 @@ static void voicemail_check_main(switch_core_session_t *session, const char *pro
*global_buf = '\0'; *global_buf = '\0';
while (switch_channel_ready(channel)) { while (switch_channel_ready(channel)) {
switch_ivr_sleep(session, 100, NULL); switch_ivr_sleep(session, 100, SWITCH_TRUE, NULL);
switch (vm_check_state) { switch (vm_check_state) {
case VM_CHECK_START: case VM_CHECK_START:

9
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -1723,7 +1723,8 @@ static JSBool session_sleep(JSContext * cx, JSObject * obj, uintN argc, jsval *
switch_input_args_t args = { 0 }; switch_input_args_t args = { 0 };
int32 ms = 0; int32 ms = 0;
jsval ret = JS_TRUE; jsval ret = JS_TRUE;
int sync;
METHOD_SANITY_CHECK(); METHOD_SANITY_CHECK();
channel = switch_core_session_get_channel(jss->session); channel = switch_core_session_get_channel(jss->session);
CHANNEL_SANITY_CHECK(); CHANNEL_SANITY_CHECK();
@ -1755,12 +1756,16 @@ static JSBool session_sleep(JSContext * cx, JSObject * obj, uintN argc, jsval *
} }
} }
if (argc > 2) {
JS_ValueToInt32(cx, argv[2], &sync);
}
cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE); cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE);
cb_state.saveDepth = JS_SuspendRequest(cx); cb_state.saveDepth = JS_SuspendRequest(cx);
args.input_callback = dtmf_func; args.input_callback = dtmf_func;
args.buf = bp; args.buf = bp;
args.buflen = len; args.buflen = len;
switch_ivr_sleep(jss->session, ms, &args); switch_ivr_sleep(jss->session, ms, sync, &args);
JS_ResumeRequest(cx, cb_state.saveDepth); JS_ResumeRequest(cx, cb_state.saveDepth);
check_hangup_hook(jss, &ret); check_hangup_hook(jss, &ret);
*rval = cb_state.ret; *rval = cb_state.ret;

4
src/switch_cpp.cpp
View File

@ -833,7 +833,7 @@ SWITCH_DECLARE(int) CoreSession::streamFile(char *file, int starting_sample_coun
} }
SWITCH_DECLARE(int) CoreSession::sleep(int ms) { SWITCH_DECLARE(int) CoreSession::sleep(int ms, int sync) {
switch_status_t status; switch_status_t status;
@ -841,7 +841,7 @@ SWITCH_DECLARE(int) CoreSession::sleep(int ms) {
sanity_check(-1); sanity_check(-1);
begin_allow_threads(); begin_allow_threads();
status = switch_ivr_sleep(session, ms, ap); status = switch_ivr_sleep(session, ms, (switch_bool_t) sync, ap);
end_allow_threads(); end_allow_threads();
return status == SWITCH_STATUS_SUCCESS ? 1 : 0; return status == SWITCH_STATUS_SUCCESS ? 1 : 0;

11
src/switch_ivr.c
View File

@ -38,7 +38,7 @@
#include <switch_ivr.h> #include <switch_ivr.h>
#include "stfu.h" #include "stfu.h"
SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_input_args_t *args) SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_bool_t sync, switch_input_args_t *args)
{ {
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
@ -80,6 +80,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session,
write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
write_frame.datalen = imp.decoded_bytes_per_packet; write_frame.datalen = imp.decoded_bytes_per_packet;
write_frame.samples = write_frame.datalen / sizeof(int16_t); write_frame.samples = write_frame.datalen / sizeof(int16_t);
if (!switch_channel_media_ready(channel)) {
if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot establish media.\n");
return SWITCH_STATUS_FALSE;
}
}
} }
cng_frame.data = data; cng_frame.data = data;
@ -87,7 +94,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session,
cng_frame.buflen = 2; cng_frame.buflen = 2;
switch_set_flag((&cng_frame), SFF_CNG); switch_set_flag((&cng_frame), SFF_CNG);
if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) { if (sync && !switch_channel_test_flag(channel, CF_PROXY_MODE)) {
switch_channel_audio_sync(channel); switch_channel_audio_sync(channel);
} }

2
src/switch_ivr_menu.c
View File

@ -529,7 +529,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *s
} }
errs++; errs++;
if (status == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) {
status = switch_ivr_sleep(session, 1000, NULL); status = switch_ivr_sleep(session, 1000, SWITCH_FALSE, NULL);
} }
/* breaks are ok too */ /* breaks are ok too */
if (SWITCH_STATUS_IS_BREAK(status)) { if (SWITCH_STATUS_IS_BREAK(status)) {

8
src/switch_ivr_originate.c
View File

@ -91,7 +91,7 @@ static void *SWITCH_THREAD_FUNC collect_thread_run(switch_thread_t *thread, void
return NULL; return NULL;
} }
switch_ivr_sleep(collect->session, 0, NULL); switch_ivr_sleep(collect->session, 0, SWITCH_TRUE, NULL);
if (!strcasecmp(collect->key, "exec")) { if (!strcasecmp(collect->key, "exec")) {
char *data; char *data;
@ -951,7 +951,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (try > 0) { if (try > 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms);
if (caller_channel) { if (caller_channel) {
switch_ivr_sleep(session, sleep_ms, NULL); switch_ivr_sleep(session, sleep_ms, SWITCH_TRUE, NULL);
} else { } else {
switch_yield(sleep_ms * 1000); switch_yield(sleep_ms * 1000);
} }
@ -1749,11 +1749,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
if (*bleg) { if (*bleg) {
switch_ivr_sleep(*bleg, 0, NULL); switch_ivr_sleep(*bleg, 0, SWITCH_TRUE, NULL);
} }
if (session) { if (session) {
switch_ivr_sleep(session, 0, NULL); switch_ivr_sleep(session, 0, SWITCH_TRUE, NULL);
} }
if (var_event && var_event != ovars) { if (var_event && var_event != ovars) {

2
src/switch_ivr_play_say.c
View File

@ -327,7 +327,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *s
} }
} }
switch_ivr_sleep(session, pause, NULL); switch_ivr_sleep(session, pause, SWITCH_FALSE, NULL);
} }
} }