Author: mikej Date: Fri May 23 12:41:19 2008 New Revision: 8540 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: change param name to avoid swig conflict Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Fri May 23 12:41:19 2008 @@ -192,7 +192,7 @@ SWITCH_DECLARE(void) setPrivate(char *var, void *val); SWITCH_DECLARE(void *)getPrivate(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) sayPhrase(const char *phrase_name, const char *phrase_data = "", const char *phrase_lang = NULL); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri May 23 12:41:19 2008 @@ -1036,7 +1036,7 @@ } -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; @@ -1044,7 +1044,7 @@ this_check(SWITCH_STATUS_FALSE); sanity_check(SWITCH_STATUS_FALSE); - if (switch_strlen_zero(ret)) { + if (switch_strlen_zero(result)) { return SWITCH_STATUS_SUCCESS; } @@ -1076,10 +1076,10 @@ } - if (!strncasecmp(ret, "speed", 4)) { + if (!strncasecmp(result, "speed", 4)) { char *p; - if ((p = strchr(ret, ':'))) { + if ((p = strchr(result, ':'))) { p++; if (*p == '+' || *p == '-') { int step; @@ -1096,28 +1096,28 @@ return SWITCH_STATUS_FALSE; - } else if (!strcasecmp(ret, "pause")) { + } else if (!strcasecmp(result, "pause")) { if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { switch_clear_flag(fh, SWITCH_FILE_PAUSE); } else { switch_set_flag(fh, SWITCH_FILE_PAUSE); } return SWITCH_STATUS_SUCCESS; - } else if (!strcasecmp(ret, "stop")) { + } else if (!strcasecmp(result, "stop")) { return SWITCH_STATUS_FALSE; - } else if (!strcasecmp(ret, "restart")) { + } else if (!strcasecmp(result, "restart")) { unsigned int pos = 0; fh->speed = 0; switch_core_file_seek(fh, &pos, 0, SEEK_SET); return SWITCH_STATUS_SUCCESS; - } else if (!strncasecmp(ret, "seek", 4)) { + } else if (!strncasecmp(result, "seek", 4)) { switch_codec_t *codec; unsigned int samps = 0; unsigned int pos = 0; char *p; codec = switch_core_session_get_read_codec(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n"); - if ((p = strchr(ret, ':'))) { + if ((p = strchr(result, ':'))) { p++; if (*p == '+' || *p == '-') { int step; @@ -1146,7 +1146,7 @@ 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"); return SWITCH_STATUS_SUCCESS; }