retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

change param name to avoid swig conflict 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8540 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-23 16:41:19 +00:00
parent b3c03865d5
commit fe854bdb57
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_cpp.h
View File

@ -192,7 +192,7 @@ class CoreSession {
SWITCH_DECLARE(void) setPrivate(char *var, void *val); SWITCH_DECLARE(void) setPrivate(char *var, void *val);
SWITCH_DECLARE(void *)getPrivate(char *var); SWITCH_DECLARE(void *)getPrivate(char *var);
SWITCH_DECLARE(const char *)getVariable(char *var); SWITCH_DECLARE(const char *)getVariable(char *var);
SWITCH_DECLARE(switch_status_t) process_callback_result(char *ret); SWITCH_DECLARE(switch_status_t) process_callback_result(char *result);
SWITCH_DECLARE(void) say(const char *tosay, const char *module_name, const char *say_type, const char *say_method); SWITCH_DECLARE(void) say(const char *tosay, const char *module_name, const char *say_type, const char *say_method);
SWITCH_DECLARE(void) sayPhrase(const char *phrase_name, const char *phrase_data = "", const char *phrase_lang = NULL); SWITCH_DECLARE(void) sayPhrase(const char *phrase_name, const char *phrase_data = "", const char *phrase_lang = NULL);

20
src/switch_cpp.cpp
View File

@ -1036,7 +1036,7 @@ SWITCH_DECLARE_NONSTD(switch_status_t) dtmf_callback(switch_core_session_t *sess
} }
SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret) SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *result)
{ {
switch_file_handle_t *fh = NULL; switch_file_handle_t *fh = NULL;
@ -1044,7 +1044,7 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
this_check(SWITCH_STATUS_FALSE); this_check(SWITCH_STATUS_FALSE);
sanity_check(SWITCH_STATUS_FALSE); sanity_check(SWITCH_STATUS_FALSE);
if (switch_strlen_zero(ret)) { if (switch_strlen_zero(result)) {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -1076,10 +1076,10 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
} }
if (!strncasecmp(ret, "speed", 4)) { if (!strncasecmp(result, "speed", 4)) {
char *p; char *p;
if ((p = strchr(ret, ':'))) { if ((p = strchr(result, ':'))) {
p++; p++;
if (*p == '+' || *p == '-') { if (*p == '+' || *p == '-') {
int step; int step;
@ -1096,28 +1096,28 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} else if (!strcasecmp(ret, "pause")) { } else if (!strcasecmp(result, "pause")) {
if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) {
switch_clear_flag(fh, SWITCH_FILE_PAUSE); switch_clear_flag(fh, SWITCH_FILE_PAUSE);
} else { } else {
switch_set_flag(fh, SWITCH_FILE_PAUSE); switch_set_flag(fh, SWITCH_FILE_PAUSE);
} }
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} else if (!strcasecmp(ret, "stop")) { } else if (!strcasecmp(result, "stop")) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} else if (!strcasecmp(ret, "restart")) { } else if (!strcasecmp(result, "restart")) {
unsigned int pos = 0; unsigned int pos = 0;
fh->speed = 0; fh->speed = 0;
switch_core_file_seek(fh, &pos, 0, SEEK_SET); switch_core_file_seek(fh, &pos, 0, SEEK_SET);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} else if (!strncasecmp(ret, "seek", 4)) { } else if (!strncasecmp(result, "seek", 4)) {
switch_codec_t *codec; switch_codec_t *codec;
unsigned int samps = 0; unsigned int samps = 0;
unsigned int pos = 0; unsigned int pos = 0;
char *p; char *p;
codec = switch_core_session_get_read_codec(session); codec = switch_core_session_get_read_codec(session);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n");
if ((p = strchr(ret, ':'))) { if ((p = strchr(result, ':'))) {
p++; p++;
if (*p == '+' || *p == '-') { if (*p == '+' || *p == '-') {
int step; int step;
@ -1146,7 +1146,7 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) { if (!strcmp(result, "true") || !strcmp(result, "undefined")) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }