This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "FreeSWITCH". The branch, master has been updated via 92a9bacc44576e7b1d41c48752af597801e41d21 (commit) via d395b654fb0abab4889d5b8c239728683e772959 (commit) via acd56d2fe2a0458801010cc6b03c524023cbc597 (commit) from 8f483f41c78ae3dd1bad7c3378733f04438f6af1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 92a9bacc44576e7b1d41c48752af597801e41d21 Merge: 8f483f4 d395b65 Author: Luke Dashjr <luke@openmethods.com> Date: Sun Aug 22 20:24:53 2010 -0500 MERGE: expose ASR start_input_timers to dialplan via IVR and mod_dptools diff --cc src/mod/applications/mod_dptools/mod_dptools.c index f573661,2f49630..fe089a6 --- a/src/mod/applications/mod_dptools/mod_dptools.c +++ b/src/mod/applications/mod_dptools/mod_dptools.c @@@ -96,7 -96,7 +96,7 @@@ SWITCH_STANDARD_DIALPLAN(inline_dialpla return extension; } - #define DETECT_SPEECH_SYNTAX "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR nogrammar <gram_name> OR grammaron/grammaroff <gram_name> OR grammarsalloff OR pause OR resume OR stop OR param <name> <value>" -#define DETECT_SPEECH_SYNTAX "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume OR start_input_timers" ++#define DETECT_SPEECH_SYNTAX "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR nogrammar <gram_name> OR grammaron/grammaroff <gram_name> OR grammarsalloff OR pause OR resume OR start_input_timers OR stop OR param <name> <value>" SWITCH_STANDARD_APP(detect_speech_function) { char *argv[4]; commit d395b654fb0abab4889d5b8c239728683e772959 Author: Luke Dashjr <luke@openmethods.com> Date: Sun Aug 22 18:07:24 2010 -0500 expose ASR start_input_timers to dialplan via mod_dptools diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c index 5a1b8c5..2f49630 100755 --- a/src/mod/applications/mod_dptools/mod_dptools.c +++ b/src/mod/applications/mod_dptools/mod_dptools.c @@ -28,6 +28,7 @@ * Michael Murdock <mike at mmurdock dot org> * Neal Horman <neal at wanlink dot com> * Bret McDanel <trixter AT 0xdecafbad dot com> + * Luke Dashjr <luke@openmethods.com> (OpenMethods, LLC) * * mod_dptools.c -- Raw Audio File Streaming Application Module * @@ -95,7 +96,7 @@ SWITCH_STANDARD_DIALPLAN(inline_dialplan_hunt) return extension; } -#define DETECT_SPEECH_SYNTAX "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume" +#define DETECT_SPEECH_SYNTAX "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume OR start_input_timers" SWITCH_STANDARD_APP(detect_speech_function) { char *argv[4]; @@ -116,6 +117,8 @@ SWITCH_STANDARD_APP(detect_speech_function) switch_ivr_stop_detect_speech(session); } else if (!strcasecmp(argv[0], "param")) { switch_ivr_set_param_detect_speech(session, argv[1], argv[2]); + } else if (!strcasecmp(argv[0], "start_input_timers")) { + switch_ivr_detect_speech_start_input_timers(session); } else if (argc >= 3) { switch_ivr_detect_speech(session, argv[0], argv[1], argv[2], argv[3], NULL); } commit acd56d2fe2a0458801010cc6b03c524023cbc597 Author: Luke Dashjr <luke@openmethods.com> Date: Sun Aug 22 18:00:40 2010 -0500 expose ASR start_input_timers on the IVR abstraction level diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h index 40ba1dc..692ad8d 100644 --- a/src/include/switch_ivr.h +++ b/src/include/switch_ivr.h @@ -26,6 +26,7 @@ * Anthony Minessale II <anthm@freeswitch.org> * Neal Horman <neal at wanlink dot com> * Bret McDanel <trixter AT 0xdecafbad dot com> + * Luke Dashjr <luke@openmethods.com> (OpenMethods, LLC) * * switch_ivr.h -- IVR Library * @@ -201,6 +202,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_unload_grammar(switch_c SWITCH_DECLARE(switch_status_t) switch_ivr_set_param_detect_speech(switch_core_session_t *session, const char *name, const char *val); /*! + \brief Start input timers on a background speech detection handle + \param session The session to start the timers on + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_start_input_timers(switch_core_session_t *session); + +/*! \brief Record a session to disk \param session the session to record \param file the path to the file diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c index 4fe5732..ae23d0a 100644 --- a/src/switch_ivr_async.c +++ b/src/switch_ivr_async.c @@ -26,6 +26,7 @@ * Anthony Minessale II <anthm@freeswitch.org> * Michael Jerris <mike@jerris.com> * Bret McDanel <bret AT 0xdecafbad dot com> + * Luke Dashjr <luke@openmethods.com> (OpenMethods, LLC) * * switch_ivr_async.c -- IVR Library (async operations) * @@ -2728,6 +2729,18 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_set_param_detect_speech(switch_core_s return status; } +SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_start_input_timers(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + struct speech_thread_handle *sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY); + + if (sth) { + switch_core_asr_start_input_timers(sth->ah); + return SWITCH_STATUS_SUCCESS; + } + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech_unload_grammar(switch_core_session_t *session, const char *name) { switch_channel_t *channel = switch_core_session_get_channel(session); ----------------------------------------------------------------------- Summary of changes: src/include/switch_ivr.h | 7 +++++++ src/mod/applications/mod_dptools/mod_dptools.c | 4 +++- src/switch_ivr_async.c | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) hooks/post-receive -- FreeSWITCH