Author: knhor
Date: Sun Dec 24 16:27:26 2006
New Revision: 3826
Removed:
freeswitch/branches/knhor/trunk/build/thisbuild-init.sh
Modified:
freeswitch/branches/knhor/trunk/ (props changed)
freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj
freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c
freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c
freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c
freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
freeswitch/branches/knhor/trunk/src/switch_ivr.c
Log:
Merged revisions 3816-3825 via svnmerge from trunk
Modified: freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj
==============================================================================
--- freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj (original)
+++ freeswitch/branches/knhor/trunk/libs/win32/js/js.vcproj Sun Dec 24 16:27:26 2006
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h""
+ CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -111,7 +111,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -125,7 +125,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h""
+ CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -209,7 +209,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D
"
+ CommandLine=""
/>
</Configuration>
</Configurations>
Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original)
+++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Sun Dec 24 16:27:26 2006
@@ -102,7 +102,7 @@
"I have no idea what that is",
"cepstral",
"david",
- 15000, 10, NULL, NULL);
+ 15000, 10, NULL);
status = switch_ivr_menu_init(&sub_menu,
@@ -114,7 +114,7 @@
"/ram/invalid.wav",
NULL,
NULL,
- 15000, 10, NULL, NULL);
+ 15000, 10, NULL);
if (status == SWITCH_STATUS_SUCCESS) {
// build the menu
Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c (original)
+++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c Sun Dec 24 16:27:26 2006
@@ -69,7 +69,6 @@
char *engine = NULL;
char *voice = NULL;
char *text = NULL;
- char *timer_name = NULL;
char *mydata = NULL;
switch_codec_t *codec;
switch_input_args_t args = {0};
Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c (original)
+++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_rss/mod_rss.c Sun Dec 24 16:27:26 2006
@@ -184,6 +184,7 @@
char buf[1024];
int32_t jumpto = -1;
uint32_t matches = 0;
+ switch_input_args_t args = {0};
channel = switch_core_session_get_channel(session);
assert(channel != NULL);
@@ -324,14 +325,15 @@
snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>");
len = (int32_t)strlen(buf);
+ args.input_callback = NULL;
+ args.buf = cmd;
+ args.buflen = sizeof(cmd);
status = switch_ivr_speak_text_handle(session,
&sh,
&speech_codec,
timerp,
- NULL,
buf,
- cmd,
- sizeof(cmd));
+ &args);
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
goto finished;
}
@@ -370,14 +372,15 @@
} else if (matches > 1) {
} else {
+ args.input_callback = NULL;
+ args.buf = NULL;
+ args.buflen = 0;
status = switch_ivr_speak_text_handle(session,
&sh,
&speech_codec,
timerp,
- NULL,
"I'm sorry. That is an Invalid Selection. ",
- NULL,
- 0);
+ &args);
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
goto finished;
}
@@ -492,14 +495,15 @@
snprintf(buf, sizeof(buf), ",<break time=\"500ms\"/>%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ",
title_txt, description_txt, rights_txt, date);
+ args.input_callback = NULL;
+ args.buf = cmd;
+ args.buflen = sizeof(cmd);
status = switch_ivr_speak_text_handle(session,
&sh,
&speech_codec,
timerp,
- NULL,
buf,
- cmd,
- sizeof(cmd));
+ &args);
if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
goto finished;
}
@@ -591,14 +595,15 @@
}
}
switch_core_speech_flush_tts(&sh);
+ args.input_callback = on_dtmf;
+ args.buf = &dtb;
+ args.buflen = sizeof(dtb);
status = switch_ivr_speak_text_handle(session,
&sh,
&speech_codec,
timerp,
- on_dtmf,
buf,
- &dtb,
- sizeof(dtb));
+ &args);
if (status == SWITCH_STATUS_BREAK) {
continue;
} else if (status != SWITCH_STATUS_SUCCESS) {
@@ -611,14 +616,15 @@
}
if (entries[dtb.index].description_txt) {
+ args.input_callback = on_dtmf;
+ args.buf = &dtb;
+ args.buflen = sizeof(dtb);
status = switch_ivr_speak_text_handle(session,
&sh,
&speech_codec,
timerp,
- on_dtmf,
entries[dtb.index].description_txt,
- &dtb,
- sizeof(dtb));
+ &args);
}
if (status == SWITCH_STATUS_BREAK) {
continue;
Modified: freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original)
+++ freeswitch/branches/knhor/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun Dec 24 16:27:26 2006
@@ -2262,7 +2262,9 @@
JS_InitStandardClasses(cx, javascript_object);
/* this doesnt load in standard classes figure out wtf */
- js_InitFileClass(cx, javascript_object);
+#ifndef _MSC_VER //somthing is badly wrong in our build here, need to fix this.
+ js_InitFileClass(cx, javascript_object);
+#endif
JS_InitClass(cx,
javascript_object,
Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original)
+++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Sun Dec 24 16:27:26 2006
@@ -450,7 +450,7 @@
break;
}
- if (args->input_callback || args->buf || args->buflen) {
+ if (args && (args->input_callback || args->buf || args->buflen)) {
/*
dtmf handler function you can hook up to be executed when a digit is dialed during playback
if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
@@ -1162,7 +1162,7 @@
switch_event_destroy(&event);
}
- if (args->input_callback || args->buf || args->buflen) {
+ if (args && (args->input_callback || args->buf || args->buflen)) {
/*
dtmf handler function you can hook up to be executed when a digit is dialed during playback
if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.
@@ -1559,7 +1559,7 @@
switch_event_destroy(&event);
}
- if (args->input_callback || args->buf || args->buflen) {
+ if (args && (args->input_callback || args->buf || args->buflen)) {
/*
dtmf handler function you can hook up to be executed when a digit is dialed during playback
if you return anything but SWITCH_STATUS_SUCCESS the playback will stop.