[Freeswitch-trunk] [GIT]FreeSWITCH branch master updated. v1.0.6-1119-ge719ae6

[git at svn.freeswitch.org]

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
  discards  439df43cae04a053a1c22befdd7f1009f6cb6dfa (commit)
       via  e719ae662b7cb08ebd7f8e732a140e9aeb502960 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (439df43cae04a053a1c22befdd7f1009f6cb6dfa)
            \
             N -- N -- N (e719ae662b7cb08ebd7f8e732a140e9aeb502960)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 e719ae662b7cb08ebd7f8e732a140e9aeb502960
Author: Luke Dashjr <luke at openmethods.com>
Date:   Sat Aug 21 17:44:42 2010 -0500

    Allow loading grammars without sending RECOGNIZE with start-recognize=false parameter

diff --git a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
index 41c0ccd..a27ddf0 100644
--- a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
+++ b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
@@ -26,6 +26,7 @@
  *
  * Brian West <brian at freeswitch.org>
  * Christopher M. Rienzo <chris at rienzo.net>
+ * Luke Dashjr <luke at openmethods.com> (OpenMethods, LLC)
  *
  * mod_unimrcp.c -- UniMRCP module (MRCP client)
  *
@@ -2451,6 +2452,8 @@ static switch_status_t recog_channel_set_params(speech_channel_t *schannel, mrcp
 			if (id) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) \"%s\": \"%s\"\n", schannel->name, param_name, param_val);
 				recog_channel_set_header(schannel, id->id, param_val, msg, recog_hdr);
+			} else if (!strcasecmp(param_name, "start-recognize")) {
+				// This parameter is used internally only, not in MRCP headers
 			} else {
 				/* this is probably a vendor-specific MRCP param */
 				apt_str_t apt_param_name = { 0 };
@@ -2782,6 +2785,7 @@ static switch_status_t recog_asr_load_grammar(switch_asr_handle_t *ah, const cha
 	speech_channel_t *schannel = (speech_channel_t *) ah->private_info;
 	const char *grammar_data = NULL;
 	char *grammar_file_data = NULL;
+	char *start_recognize;
 	switch_file_t *grammar_file = NULL;
 	switch_size_t grammar_file_size = 0, to_read = 0;
 	grammar_type_t type = GRAMMAR_TYPE_UNKNOWN;
@@ -2886,7 +2890,9 @@ static switch_status_t recog_asr_load_grammar(switch_asr_handle_t *ah, const cha
 		goto done;
 	}
 
-	status = recog_channel_start(schannel, name);
+	start_recognize = (char *) switch_core_hash_find(schannel->params, "start-recognize");
+	if (zstr(start_recognize) || strcasecmp(start_recognize, "false"))
+		status = recog_channel_start(schannel, name);
 
   done:
 

-----------------------------------------------------------------------

Summary of changes:
 src/mod/applications/mod_dptools/mod_dptools.c |    3 +--
 src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c      |    8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FreeSWITCH