December 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3807 - in freeswitch/trunk/src: . include mod/say/mod_say_en
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: anthm Date: Fri Dec 22 17:33:48 2006 New Revision: 3807 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_ivr.c Log: say related stuff Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Fri Dec 22 17:33:48 2006 @@ -262,6 +262,9 @@ #define switch_thread_data_set apr_thread_data_set #define switch_thread_data_get apr_thread_data_get #define switch_thread_self apr_os_thread_current +#define switch_time_make(sec, usec) ((apr_time_t)(sec) * APR_USEC_PER_SEC \ + + (apr_time_t)(usec)) + /** * Put the active calling thread to sleep until signaled to wake up. Each Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Dec 22 17:33:48 2006 @@ -30,46 +30,84 @@ */ #include <switch.h> #include <math.h> +#include <ctype.h> static const char modname[] = "mod_say_en"; -typedef struct { - switch_core_session_t *session; - switch_input_callback_function_t input_callback; - void *buf; - uint32_t buflen; -} common_args_t; -static void play_group(int a, int b, int c, char *what, common_args_t *args) +#define say_num(num) {\ + char tmp[80];\ + switch_status_t status;\ + snprintf(tmp, sizeof(tmp), "%d", num);\ + if ((status = en_say_general_count(session, tmp, SST_ITEMS, SSM_PRONOUNCED, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) {\ + return status;\ + }}\ + +#define say_file(...) {\ + char tmp[80];\ + snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); \ + if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ + return SWITCH_STATUS_FALSE;\ + }}\ + + + +static switch_status_t en_spell(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) { - char tmp[80] = ""; + char *p; + for(p = tosay; p && *p; p++) { + int a = tolower((int) *p); + if (type == SST_NAME_SPELLED) { + say_file("ascii/%d.wav", a); + } else if (type == SST_NAME_PHONETIC) { + say_file("phonetic-ascii/%d.wav", a); + } + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t play_group(int a, + int b, + int c, + char *what, + switch_core_session_t *session, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + if (a) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", a); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); - switch_ivr_play_file(args->session, NULL, "digits/hundred.wav", NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d.wav", a); + say_file("digits/hundred.wav"); } if (b) { if (b > 1) { - snprintf(tmp, sizeof(tmp), "digits/%d0.wav", b); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d0.wav", b); } else { - snprintf(tmp, sizeof(tmp), "digits/%d%d.wav", b, c); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d%d.wav", b, c); c = 0; } } if (c) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", c); - switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + say_file("digits/%d.wav", c); } if (what && (a || b || c)) { - switch_ivr_play_file(args->session, NULL, what, NULL, args->input_callback, args->buf, args->buflen); + say_file(what); } + return SWITCH_STATUS_SUCCESS; } static char *strip_commas(char *in, char *out, switch_size_t len) @@ -106,19 +144,13 @@ switch_channel_t *channel; int in; int x = 0, places[9] = {0}; - char tmp[80] = ""; char sbuf[13] = ""; - common_args_t args = {0}; - + switch_status_t status; + assert(session != NULL); channel = switch_core_session_get_channel(session); assert(channel != NULL); - args.session = session; - args.input_callback = input_callback; - args.buf = buf; - args.buflen = buflen; - if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 9) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); return SWITCH_STATUS_GENERR; @@ -135,15 +167,20 @@ switch (method) { case SSM_PRONOUNCED: - play_group(places[8], places[7], places[6], "digits/million.wav", &args); - play_group(places[5], places[4], places[3], "digits/thousand.wav", &args); - play_group(places[2], places[1], places[0], NULL, &args); + if ((status = play_group(places[8], places[7], places[6], "digits/million.wav", session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + return status; + } + if ((status = play_group(places[5], places[4], places[3], "digits/thousand.wav", session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + return status; + } + if ((status = play_group(places[2], places[1], places[0], NULL, session, input_callback, buf, buflen)) != SWITCH_STATUS_SUCCESS) { + return status; + } break; case SSM_ITERATED: for(x = 8; x >= 0; x--) { if (places[x]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[x]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); + say_file("digits/%d.wav", places[x]); } } break; @@ -153,6 +190,138 @@ return SWITCH_STATUS_SUCCESS; } + +static switch_status_t en_say_time(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + int32_t t; + switch_time_t target = 0; + switch_time_exp_t tm; + uint8_t say_date = 0, say_time = 0; + + if (type == SST_TIME_MEASUREMENT) { + int32_t hours = 0; + int32_t minutes = 0; + int32_t seconds = 0; + int32_t r = 0; + + if (strchr(tosay, ':')) { + char *tme = switch_core_session_strdup(session, tosay); + char *p; + + if ((p = strrchr(tme, ':'))) { + *p++ = '\0'; + seconds = atoi(p); + if ((p = strrchr(tme, ':'))) { + *p++ = '\0'; + minutes = atoi(p); + if (tme) { + hours = atoi(tme); + } + } + } + } else { + if ((seconds = atoi(tosay)) <= 0) { + seconds = (time_t) time(NULL); + } + + if (seconds >= 60) { + minutes = seconds / 60; + r = seconds % 60; + seconds = r; + } + + if (minutes >= 60) { + hours = minutes / 60; + r = minutes % 60; + minutes = r; + } + } + + if (hours) { + say_num(hours); + say_file("digits/hours.wav"); + } + + if (minutes) { + say_num(minutes); + say_file("digits/minutes.wav"); + } + + if (seconds) { + say_num(seconds); + say_file("digits/seconds.wav"); + } + + return SWITCH_STATUS_SUCCESS; + } + + if ((t = atoi(tosay)) > 0) { + target = switch_time_make(t, 0); + } else { + target = switch_time_now(); + } + switch_time_exp_lt(&tm, target); + + switch(type) { + case SST_CURRENT_DATE_TIME: + say_date = say_time = 1; + break; + case SST_CURRENT_DATE: + say_date = 1; + break; + case SST_CURRENT_TIME: + say_time = 1; + break; + default: + break; + } + + if (say_date) { + say_file("digits/day-%d.wav", tm.tm_wday); + say_file("digits/mon-%d.wav", tm.tm_mon); + say_num(tm.tm_mday); + say_num(tm.tm_year + 1900); + } + + if (say_time) { + uint8_t hour = tm.tm_hour, pm = 0; + + if (hour > 12) { + hour -= 12; + pm = 1; + } else if (hour == 12) { + pm = 1; + } else if (hour == 0) { + hour = 12; + pm = 0; + } + + say_num(hour); + + if (tm.tm_min > 9) { + say_num(tm.tm_min); + } else if (tm.tm_min) { + say_file("digits/oh.wav"); + say_num(tm.tm_min); + } else { + say_file("digits/oclock.wav"); + } + + say_file("digits/%s.wav", pm ? "p-m" : "a-m"); + } + + return SWITCH_STATUS_SUCCESS; +} + + + + static switch_status_t en_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, @@ -170,6 +339,16 @@ case SST_PERSONS: case SST_MESSAGES: say_cb = en_say_general_count; + break; + case SST_TIME_MEASUREMENT: + case SST_CURRENT_DATE: + case SST_CURRENT_TIME: + case SST_CURRENT_DATE_TIME: + say_cb = en_say_time; + break; + case SST_NAME_SPELLED: + case SST_NAME_PHONETIC: + say_cb = en_spell; break; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Finish ME!\n"); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 17:33:48 2006 @@ -4525,7 +4525,7 @@ odata = expanded; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Handle %s:[%s] (%s)\n", func, odata, lang); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s)\n", func, odata, lang); if (!strcasecmp(func, "play-file")) { switch_ivr_play_file(session, NULL, odata, NULL, input_callback, buf, buflen);

1 0

[commit] r3806 - freeswitch/trunk/src
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 16:35:03 2006 New Revision: 3806 Modified: freeswitch/trunk/src/switch_ivr.c Log: use right type. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 16:35:03 2006 @@ -346,7 +346,7 @@ char *p; const char *vval; time_t start = 0; - int org_silence_hits = 0; + uint32_t org_silence_hits = 0; if (!fh) { fh = &lfh;

1 0

[commit] r3805 - freeswitch/trunk/src
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 16:31:47 2006 New Revision: 3805 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 16:31:47 2006 @@ -434,9 +434,9 @@ if (fh->thresh) { if (fh->silence_hits) { - fh->silence_hits = fh->samplerate * fh->silence_hits; + fh->silence_hits = fh->samplerate * fh->silence_hits / read_codec->implementation->samples_per_frame; } else { - fh->silence_hits = fh->samplerate * 3; + fh->silence_hits = fh->samplerate * 3 / read_codec->implementation->samples_per_frame; } org_silence_hits = fh->silence_hits; } @@ -504,8 +504,7 @@ score = (uint32_t)(energy / samples); if (score < fh->thresh) { - fh->silence_hits -= fh->samplerate; - if (fh->silence_hits <= 0) { + if (!--fh->silence_hits) { break; } } else {

1 0

[commit] r3804 - freeswitch/trunk
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 16:13:44 2006 New Revision: 3804 Modified: freeswitch/trunk/modules.conf.in Log: add missing module to modules.conf.in Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Fri Dec 22 16:13:44 2006 @@ -44,5 +44,6 @@ #languages/mod_spidermonkey_teletone #languages/mod_spidermonkey_core_db #languages/mod_spidermonkey_odbc +#languages/mod_spidermonkey_etpan timers/mod_softtimer #xml_int/mod_xml_rpc

1 0

[commit] r3803 - freeswitch/trunk/src
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 16:10:20 2006 New Revision: 3803 Modified: freeswitch/trunk/src/switch_ivr.c Log: default timeout on record to 3 seconds, reset timeout when we hear sound above the threshold, change terms of silence timeout to be seconds. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 16:10:20 2006 @@ -346,6 +346,7 @@ char *p; const char *vval; time_t start = 0; + int org_silence_hits = 0; if (!fh) { fh = &lfh; @@ -432,10 +433,13 @@ } if (fh->thresh) { - if (!fh->silence_hits) { - fh->silence_hits = 20; + if (fh->silence_hits) { + fh->silence_hits = fh->samplerate * fh->silence_hits; + } else { + fh->silence_hits = fh->samplerate * 3; } - } + org_silence_hits = fh->silence_hits; + } while(switch_channel_ready(channel)) { switch_size_t len; @@ -500,10 +504,13 @@ score = (uint32_t)(energy / samples); if (score < fh->thresh) { - if (!--fh->silence_hits) { + fh->silence_hits -= fh->samplerate; + if (fh->silence_hits <= 0) { break; } - } + } else { + fh->silence_hits = org_silence_hits; + } } if (!switch_test_flag(fh, SWITCH_FILE_PAUSE)) {

1 0

[commit] r3802 - freeswitch/trunk/src
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: anthm Date: Fri Dec 22 15:06:17 2006 New Revision: 3802 Modified: freeswitch/trunk/src/switch_ivr.c Log: cant memset Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 15:06:17 2006 @@ -338,7 +338,7 @@ { switch_channel_t *channel; char dtmf[128]; - switch_file_handle_t lfh; + switch_file_handle_t lfh = {0}; switch_frame_t *read_frame; switch_codec_t codec, *read_codec; char *codec_name; @@ -350,7 +350,6 @@ if (!fh) { fh = &lfh; } - memset(fh, 0, sizeof(*fh)); channel = switch_core_session_get_channel(session); assert(channel != NULL);

1 0

[commit] r3801 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:37:13 2006 New Revision: 3801 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Log: avoid namespace collision. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Fri Dec 22 14:37:13 2006 @@ -223,7 +223,7 @@ {0} }; -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t etpan_load(JSContext *cx, JSObject *obj) { JS_DefineFunctions(cx, obj, etpan_functions); @@ -244,7 +244,7 @@ const sm_module_interface_t etpan_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ etpan_load, /*.next*/ NULL };

1 0

[commit] r3800 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:25:38 2006 New Revision: 3800 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add uuid to session properties for spidermonkey Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Dec 22 14:25:38 2006 @@ -1592,7 +1592,7 @@ /*********************************************************************************/ enum session_tinyid { SESSION_NAME, SESSION_STATE, - PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST + PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST, SESSION_UUID }; static JSFunctionSpec session_methods[] = { @@ -1627,6 +1627,7 @@ {"ani", PROFILE_ANI, JSPROP_READONLY|JSPROP_PERMANENT}, {"aniii", PROFILE_ANI_II, JSPROP_READONLY|JSPROP_PERMANENT}, {"destination", PROFILE_DEST, JSPROP_READONLY|JSPROP_PERMANENT}, + {"uuid", SESSION_UUID, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; @@ -1659,6 +1660,9 @@ switch(param) { case SESSION_NAME: *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel))); + break; + case SESSION_UUID: + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_uuid(channel))); break; case SESSION_STATE: *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_state_name(switch_channel_get_state(channel))));

1 0

[commit] r3799 - in freeswitch/trunk/src: . mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:03:25 2006 New Revision: 3799 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_ivr.c Log: change types for len to uint32_t. Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Dec 22 14:03:25 2006 @@ -151,11 +151,11 @@ char *application = (char*) switch_xml_attr_soft(xaction, "application"); char *data = (char *) switch_xml_attr_soft(xaction, "data"); char *substituted = NULL; - switch_size_t len = 0; + uint32_t len = 0; char *app_data = NULL; if (field && strchr(expression, '(')) { - len = strlen(data) + strlen(field_data) + 10; + len = (uint32_t)(strlen(data) + strlen(field_data) + 10); if (!(substituted = malloc(len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); proceed = 0; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 14:03:25 2006 @@ -4488,7 +4488,7 @@ pcre *re = NULL; int proceed = 0, ovector[30]; char *substituted = NULL; - switch_size_t len = 0; + uint32_t len = 0; char *odata = NULL; char *expanded = NULL; @@ -4498,7 +4498,7 @@ char *func = (char *) switch_xml_attr_soft(action, "function"); if (strchr(pattern, '(') && strchr(adata, '$')) { - len = strlen(data) + strlen(adata) + 10; + len = (uint32_t)(strlen(data) + strlen(adata) + 10); if (!(substituted = malloc(len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); switch_clean_re(re);

1 0

[commit] r3798 - in freeswitch/trunk: libs/win32/apr-iconv libs/win32/apr-util src/mod/event_handlers/mod_xmpp_event src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:02:52 2006 New Revision: 3798 Modified: freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Log: fix windows build paths from moving libs in tree. Modified: freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj Fri Dec 22 14:02:52 2006 @@ -48,7 +48,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libapriconv.pch" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj Fri Dec 22 14:02:52 2006 @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libaprutil.pch" @@ -149,7 +149,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj Fri Dec 22 14:02:52 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Fri Dec 22 14:02:52 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Fri Dec 22 14:02:52 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0"

1 0