git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9864 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West
2008-10-06 23:05:55 +00:00
parent ce7016af1b
commit 1cda796da8
21 changed files with 41 additions and 41 deletions
@@ -774,7 +774,7 @@ SWITCH_STANDARD_API(ctl_function)
} else if (!strcasecmp(argv[0], "sync_clock")) {
arg = 0;
switch_core_session_ctl(SCSC_SYNC_CLOCK, &arg);
stream->write_function(stream, "+OK clock syncronized\n");
stream->write_function(stream, "+OK clock synchronize\n");
} else {
stream->write_function(stream, "-ERR INVALID COMMAND\nUSAGE: fsctl %s", CTL_SYNTAX);
goto end;
@@ -2128,7 +2128,7 @@ SWITCH_STANDARD_API(show_function)
/* If you change the field qty or order of any of these select */
/* statmements, you must also change show_callback and friends to match! */
/* statements, you must also change show_callback and friends to match! */
if (!command) {
stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX);
goto end;
@@ -444,7 +444,7 @@ static conference_relationship_t *member_get_relationship(conference_member_t *m
break;
}
/* 0 matches everyone. (We will still test the others brcause a real match carries more clout) */
/* 0 matches everyone. (We will still test the others because a real match carries more clout) */
if (rel->id == 0) {
global = rel;
}
@@ -1031,7 +1031,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
int16_t *bptr, *muxed;
if (imember == omember || !imember->read) {
/* Don't add audio from yourself or if you didnt read any */
/* Don't add audio from yourself or if you didn't read any */
continue;
}
@@ -1802,7 +1802,7 @@ static void conference_loop_output(conference_member_t *member)
conference_outcall_bg(member->conference, NULL, NULL, cp->string, to, switch_str_nil(flags), cid_name, cid_num);
}
}
/* Fair WARNING, If you expect the caller to hear anything or for digit handling to be proccessed, */
/* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed, */
/* you better not block this thread loop for more than the duration of member->conference->timer_name! */
while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD)
&& switch_channel_ready(channel)) {
@@ -2035,7 +2035,7 @@ static void conference_loop_output(conference_member_t *member)
member->conference->bridge_hangup_cause = switch_channel_get_cause(channel);
}
/* Wait for the input thead to end */
/* Wait for the input thread to end */
while (switch_test_flag(member, MFLAG_ITHREAD)) {
switch_yield(1000);
}
@@ -1782,7 +1782,7 @@ SWITCH_STANDARD_APP(record_session_function)
/* not at the end and the rest is numbers lets parse out the limit and fix up the path */
if (*limit_start != '\0' && switch_is_number(limit_start) == SWITCH_TRUE) {
limit = atoi(limit_start);
/* back it off by one charecter to the char before the + */
/* back it off by one character to the char before the + */
path_end--;
/* trim spaces to the left of the plus */
@@ -2261,7 +2261,7 @@ static switch_status_t api_chat_send(char *proto, char *from, char *to, char *su
#define SET_PROFILE_VAR_LONG_DESC "Set a caller profile variable for the channel calling the application."
#define EXPORT_LONG_DESC "Set and export a channel variable for the channel calling the application."
#define LOG_LONG_DESC "Logs a channel variable for the channel calling the application."
#define TRANSFER_LONG_DESC "Immediatly transfer the calling channel to a new extension"
#define TRANSFER_LONG_DESC "Immediately transfer the calling channel to a new extension"
#define SLEEP_LONG_DESC "Pause the channel for a given number of milliseconds, consuming the audio for that period of time."
SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load)
{
+2 -2
View File
@@ -531,7 +531,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
pvt->filename = switch_core_session_strdup(session, fname);
switch_safe_free(fname);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot automagically set fax RX destination file\n");
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot automatically set fax RX destination file\n");
goto done;
}
} else {
@@ -631,7 +631,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
goto done;
}
/* Skip CNG frames (autogenerated by FreeSWITCH, usually) */
/* Skip CNG frames (auto-generated by FreeSWITCH, usually) */
if (!switch_test_flag(read_frame, SFF_CNG)) {
/* pass the new incoming audio frame to the fax_rx function */
if (fax_rx(pvt->fax_state, (int16_t *) read_frame->data, read_frame->samples)) {
+1 -1
View File
@@ -59,7 +59,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown);
/*
If it exists, this is called in it's own thread when the module-load completes
If it returns anything but SWITCH_STATUS_TERM it will be called again automaticly
If it returns anything but SWITCH_STATUS_TERM it will be called again automatically
SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime);
{
while(looping)
@@ -1505,7 +1505,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
header_string = switch_core_session_sprintf(session, "%s\nX-Voicemail-Length: %u", headers, message_len);
if (switch_event_create(&event, SWITCH_EVENT_GENERAL) == SWITCH_STATUS_SUCCESS) {
/* this isnt done? it was in the other place
/* this isn't done? it was in the other place
* switch_channel_event_set_data(channel, event);
*/
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Message-Type", "forwarded-voicemail");
@@ -2596,7 +2596,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, cons
}
if (send_mail && (!(send_main || send_notify))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to leaving message locally due to too many misconfigurations.\n");
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to leaving message locally due to too many misconfiguration.\n");
send_mail = 0;
insert_db = 1;
}
@@ -2687,7 +2687,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, cons
argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
if (argc >= 1 && argc <= 4) {
switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
/* the application still runs after we leave it so we need to make sure that we dont do anything evil */
/* the application still runs after we leave it so we need to make sure that we don't do anything evil */
send_mail = 0;
goto end;
}
@@ -2701,7 +2701,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, cons
argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
if (argc >= 1 && argc <= 4) {
switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
/* the application still runs after we leave it so we need to make sure that we dont do anything evil */
/* the application still runs after we leave it so we need to make sure that we don't do anything evil */
send_mail = 0;
goto end;
}
+2 -2
View File
@@ -293,10 +293,10 @@ static mrcp_status_t openmrcp_recog_start(mrcp_client_context_t *context, openmr
/**
* Freeswitch calls this from switch_ivr_detect_speech() and then adds a media
* bug to tap into the channel's audio, which will result in all data getting
* passed to asr_feed() and calls to asr_check_results() on each recevied frame.
* passed to asr_feed() and calls to asr_check_results() on each received frame.
*
* This code expects certain one-time initialization of the openmrcp client
* engine/systeme to have already taken place.function to open the asr interface
* engine/system to have already taken place.function to open the asr interface
*/
static switch_status_t openmrcp_asr_open(switch_asr_handle_t *ah, const char *codec, int rate, const char *dest, switch_asr_flag_t *flags)
{
@@ -285,7 +285,7 @@ static switch_status_t pocketsphinx_asr_feed(switch_asr_handle_t *ah, void *data
switch_clear_flag(ps, PSFLAG_READY);
if ((hyp = ps_get_hyp(ps->ps, &ps->score, &ps->uttid))) {
if (switch_strlen_zero(hyp)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Lost the text, nevermind....\n");
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Lost the text, never mind....\n");
ps_start_utt(ps->ps, NULL);
switch_set_flag(ps, PSFLAG_READY);
} else {
@@ -313,7 +313,7 @@ static switch_status_t pocketsphinx_asr_feed(switch_asr_handle_t *ah, void *data
return SWITCH_STATUS_SUCCESS;
}
/*! funciton to pause recognizer */
/*! function to pause recognizer */
static switch_status_t pocketsphinx_asr_pause(switch_asr_handle_t *ah)
{
pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info;
@@ -805,7 +805,7 @@ static switch_status_t load_config(void)
globals.codec_ms = tmp;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"codec-ms must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
"codec-ms must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
}
} else if (!strcmp(var, "dialplan")) {
set_global_dialplan(val);
@@ -26,7 +26,7 @@
* Anthony Minessale II <anthmct@yahoo.com>
*
*
* mod_event_socket.c -- Socket Controled Event Handler
* mod_event_socket.c -- Socket Controlled Event Handler
*
*/
#include <switch.h>
@@ -466,7 +466,7 @@ static void launch_threads(void)
source->interval = tmp;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
"Interval must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
}
} else if (!strcasecmp(var, "timer-name")) {
source->timer_name = switch_core_strdup(source->pool, val);
@@ -644,7 +644,7 @@ SWITCH_STANDARD_API(start_local_stream_function)
interval = tmp;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
"Interval must be multiple of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
}
} else if (!strcasecmp(var, "timer-name")) {
timer_name = strdup(val);
+1 -1
View File
@@ -52,7 +52,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown);
SWITCH_MODULE_DEFINITION(mod_xml_cdr, mod_xml_cdr_load, mod_xml_cdr_shutdown, NULL);
/* this function would have access to the HTML returned by the webserver, we dont need it
/* this function would have access to the HTML returned by the webserver, we don't need it
* and the default curl activity is to print to stdout, something not as desirable
* so we have a dummy function here
*/