diff --git a/libs/jrtplib/examples/Makefile b/libs/jrtplib/examples/Makefile index 7bbcff4643..509a97cba6 100644 --- a/libs/jrtplib/examples/Makefile +++ b/libs/jrtplib/examples/Makefile @@ -34,8 +34,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu noinst_PROGRAMS = example1$(EXEEXT) example2$(EXEEXT) \ example3$(EXEEXT) example4$(EXEEXT) subdir = examples @@ -114,8 +114,8 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -IS64BITLINUX_FALSE = # -IS64BITLINUX_TRUE = +IS64BITLINUX_FALSE = +IS64BITLINUX_TRUE = # LDFLAGS = LIBOBJS = LIBS = @@ -170,18 +170,18 @@ am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = i686-pc-linux-gnu build_alias = -build_cpu = x86_64 +build_cpu = i686 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc datadir = ${prefix}/share exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = i686-pc-linux-gnu host_alias = -host_cpu = x86_64 +host_cpu = i686 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc includedir = ${prefix}/include infodir = ${prefix}/info install_sh = /usr/src/freeswitch.trunk/libs/jrtplib/install-sh diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index f5909c9c2e..b4a534b4bd 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -32,7 +32,7 @@ #ifndef HAVE_CURL #define HAVE_CURL #endif - +#define JS_BUFFER_SIZE 131072 #include #include "jstypes.h" @@ -1523,7 +1523,7 @@ static JSBool teletone_construct(JSContext *cx, JSObject *obj, uintN argc, jsval } } - switch_buffer_create(pool, &tto->audio_buffer, SWITCH_RECCOMMENDED_BUFFER_SIZE); + switch_buffer_create(pool, &tto->audio_buffer, JS_BUFFER_SIZE); tto->pool = pool; tto->obj = obj; tto->cx = cx; @@ -1604,7 +1604,7 @@ static JSBool teletone_generate(JSContext *cx, JSObject *obj, uintN argc, jsval } loops--; if (!tto->loop_buffer) { - switch_buffer_create(tto->pool, &tto->loop_buffer, SWITCH_RECCOMMENDED_BUFFER_SIZE); + switch_buffer_create(tto->pool, &tto->loop_buffer, JS_BUFFER_SIZE); } } @@ -1633,6 +1633,7 @@ static JSBool teletone_generate(JSContext *cx, JSObject *obj, uintN argc, jsval } for(;;) { + if (switch_test_flag(tto, TTF_DTMF)) { char dtmf[128]; char code[512]; @@ -1677,7 +1678,7 @@ static JSBool teletone_generate(JSContext *cx, JSObject *obj, uintN argc, jsval break; } } else { - break; + continue; } }