October 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5896 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 12:49:53 2007 New Revision: 5896 Modified: freeswitch/trunk/src/switch_utils.c Log: fix type Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Oct 16 12:49:53 2007 @@ -199,7 +199,7 @@ SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr) { - size_t score = strlen(str), x = 0; + switch_size_t score = strlen(str), x = 0; const char *a = str, *b = instr, *p = NULL; while(*a && *b) {

1 0

[commit] r5895 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 12:49:44 2007 New Revision: 5895 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: make * and # become words explicitly in the core tts func Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Oct 16 12:49:44 2007 @@ -1200,6 +1200,8 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; uint32_t rate = 0; + int extra = 0; + char *p, *tmp = NULL; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1216,9 +1218,46 @@ len = sh->samples * 2; flags = 0; - switch_sleep(200000); + //switch_sleep(200000); + for(p = text; p && *p; p++) { + if (*p == '*') { + extra += 4; + } else if (*p == '#') { + extra += 5; + } + } + + if (extra) { + char *tp; + switch_size_t mylen = strlen(text) + extra + 1; + tmp = malloc(mylen); + tp = tmp; + for (p = text; p && *p; p++) { + if (*p == '*') { + *tp++ = 's'; + *tp++ = 't'; + *tp++ = 'a'; + *tp++ = 'r'; + p++; + } else if (*p == '#') { + *tp++ = 'p'; + *tp++ = 'o'; + *tp++ = 'u'; + *tp++ = 'n'; + *tp++ = 'd'; + p++; + } else { + *tp++ = *p; + } + } + *tp = '\0'; + text = tmp; + } + switch_core_speech_feed_tts(sh, text, &flags); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Speaking text: %s\n", text); + switch_safe_free(tmp); + text = NULL; write_frame.rate = sh->rate;

1 0

[commit] r5894 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: brian Date: Tue Oct 16 12:05:07 2007 New Revision: 5894 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: add pound and star to ascii Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Tue Oct 16 12:05:07 2007 @@ -1,6 +1,8 @@ <language param="en"> <ascii> <prompt phrase="Space" filename="32.wav"/> + <prompt phrase="Pound" filename="35.wav"/> + <prompt phrase="Star" filename="42.wav"/> <prompt phrase="Dot" filename="46.wav"/> <prompt phrase="A" filename="97.wav"/> <prompt phrase="B" filename="98.wav"/> @@ -179,4 +181,4 @@ <prompt phrase="record your message at the tone, press any key or stop talking to end the recording" filename="vm-record_message.wav"/> <prompt phrase="is not available" filename="vm-play_greeting.wav"/> </voicemail> -</language> \ No newline at end of file +</language>

1 0

[commit] r5893 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 11:48:01 2007 New Revision: 5893 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: format Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Tue Oct 16 11:48:01 2007 @@ -9,7 +9,7 @@ * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * - * Software distributed under the License is distributed on an "AS IS" basis, + * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. @@ -90,8 +90,8 @@ } openmrcp_session_t; typedef enum { - FLAG_HAS_MESSAGE = (1 << 0), - FLAG_FEED_STARTED = (1 << 1), + FLAG_HAS_MESSAGE = (1 << 0), + FLAG_FEED_STARTED = (1 << 1), FLAG_TERMINATING = (1 << 2) } mrcp_flag_t; @@ -116,12 +116,12 @@ return NULL; } - if(apr_pool_create(&session_pool,NULL) != APR_SUCCESS) { + if(apr_pool_create(&session_pool, NULL) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to create session_pool\n"); return NULL; } - openmrcp_session = apr_palloc(session_pool,sizeof(openmrcp_session_t)); + openmrcp_session = apr_palloc(session_pool, sizeof(openmrcp_session_t)); openmrcp_session->pool = session_pool; openmrcp_session->profile = profile; openmrcp_session->client_session = NULL; @@ -132,10 +132,10 @@ switch_mutex_init(&openmrcp_session->flag_mutex, SWITCH_MUTEX_NESTED, openmrcp_session->pool); if (switch_thread_cond_create(&openmrcp_session->wait_object, openmrcp_session->pool)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "wait object creation failed\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "wait object creation failed\n"); } - openmrcp_session->client_session = mrcp_client_context_session_create(openmrcp_session->profile->mrcp_context,openmrcp_session); + openmrcp_session->client_session = mrcp_client_context_session_create(openmrcp_session->profile->mrcp_context, openmrcp_session); if (!openmrcp_session->client_session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "session creation FAILED\n"); apr_pool_destroy(session_pool); @@ -148,7 +148,7 @@ static void openmrcp_session_destroy(openmrcp_session_t *openmrcp_session) { if(openmrcp_session && openmrcp_session->pool) { - mrcp_client_context_session_destroy(openmrcp_session->profile->mrcp_context,openmrcp_session->client_session); + mrcp_client_context_session_destroy(openmrcp_session->profile->mrcp_context, openmrcp_session->client_session); apr_pool_destroy(openmrcp_session->pool); } } @@ -267,7 +267,7 @@ } generic_header->content_type = "application/srgs+xml"; - mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE); + mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE); mrcp_message->body = buf1; /* send the MRCP RECOGNIZE message to MRCP server */ @@ -290,7 +290,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "asr_open called, codec: %s, rate: %d\n", codec, rate); - if (strcmp(codec,"L16")) { + if (strcmp(codec, "L16")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only L16 codec supported\n"); return SWITCH_STATUS_GENERR; } @@ -316,7 +316,7 @@ switch_mutex_lock(asr_session->flag_mutex); mrcp_client_context_channel_add(asr_session->profile->mrcp_context, asr_session->client_session, asr_channel, NULL); - if(switch_thread_cond_timedwait(asr_session->wait_object,asr_session->flag_mutex,5000*1000) != APR_SUCCESS) { + if(switch_thread_cond_timedwait(asr_session->wait_object, asr_session->flag_mutex, 5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); } switch_mutex_unlock(asr_session->flag_mutex); @@ -379,13 +379,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "!audio_sink\n"); return SWITCH_STATUS_SUCCESS; } - audio_sink->method_set->write_frame(audio_sink,&media_frame); + audio_sink->method_set->write_frame(audio_sink, &media_frame); len -= (unsigned int)media_frame.codec_frame.size; media_frame.codec_frame.buffer = (char*)media_frame.codec_frame.buffer + media_frame.codec_frame.size; } if(len > 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame alligned data len [%d]\n",len); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame alligned data len [%d]\n", len); } return SWITCH_STATUS_SUCCESS; } @@ -444,7 +444,7 @@ /** * Freeswitch calls this method from the speech_thread() thread body method * in switch_ivr_async.c every time a new frame is received by the media bug - * attached to the audio channel. If this method returns SWITCH_STATUS_SUCCESS, + * attached to the audio channel. If this method returns SWITCH_STATUS_SUCCESS, * then Freeswitch will call openmrcp_asr_get_results() to get the result value. */ static switch_status_t openmrcp_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags) @@ -555,7 +555,7 @@ } text2speak = switch_core_sprintf(tts_session->pool, "%s%s%s", xml_head, text, xml_tail); - mrcp_message = mrcp_client_context_message_get(context,tts_session->client_session,tts_session->control_channel,SYNTHESIZER_SPEAK); + mrcp_message = mrcp_client_context_message_get(context, tts_session->client_session, tts_session->control_channel, SYNTHESIZER_SPEAK); if(!mrcp_message) { goto end; @@ -567,10 +567,10 @@ } generic_header->content_type = "application/synthesis+ssml"; - mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE); + mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE); mrcp_message->body = text2speak; - status = mrcp_client_context_channel_modify(context,tts_session->client_session,mrcp_message); + status = mrcp_client_context_channel_modify(context, tts_session->client_session, mrcp_message); end: @@ -580,12 +580,12 @@ static mrcp_status_t synth_stop(mrcp_client_context_t *context, openmrcp_session_t *tts_session) { - mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context,tts_session->client_session,tts_session->control_channel,SYNTHESIZER_STOP); + mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context, tts_session->client_session, tts_session->control_channel, SYNTHESIZER_STOP); if(!mrcp_message) { return MRCP_STATUS_FAILURE; } - return mrcp_client_context_channel_modify(context,tts_session->client_session,mrcp_message); + return mrcp_client_context_channel_modify(context, tts_session->client_session, mrcp_message); } @@ -610,7 +610,7 @@ } switch_mutex_lock(tts_session->flag_mutex); mrcp_client_context_channel_add(tts_session->profile->mrcp_context, tts_session->client_session, tts_channel, NULL); - if(switch_thread_cond_timedwait(tts_session->wait_object,tts_session->flag_mutex,5000*1000) != APR_SUCCESS) { + if(switch_thread_cond_timedwait(tts_session->wait_object, tts_session->flag_mutex, 5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); } switch_mutex_unlock(tts_session->flag_mutex); @@ -632,7 +632,7 @@ /* terminate tts session */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "terminate tts_session\n"); switch_set_flag_locked(tts_session, FLAG_TERMINATING); - mrcp_client_context_session_terminate(context,tts_session->client_session); + mrcp_client_context_session_terminate(context, tts_session->client_session); return SWITCH_STATUS_SUCCESS; } @@ -648,7 +648,7 @@ synth_speak(context, tts_session, text); - switch_clear_flag(tts_session,FLAG_FEED_STARTED); + switch_clear_flag(tts_session, FLAG_FEED_STARTED); return SWITCH_STATUS_SUCCESS; } @@ -703,9 +703,9 @@ media_frame.codec_frame.size = 160; while(return_len < *datalen) { media_frame.codec_frame.buffer = (char*)data + return_len; - audio_source->method_set->read_frame(audio_source,&media_frame); + audio_source->method_set->read_frame(audio_source, &media_frame); if(media_frame.type != MEDIA_FRAME_TYPE_AUDIO) { - memset(media_frame.codec_frame.buffer,0,media_frame.codec_frame.size); + memset(media_frame.codec_frame.buffer, 0, media_frame.codec_frame.size); } return_len += media_frame.codec_frame.size; } @@ -720,7 +720,7 @@ mrcp_client_context_t *context = tts_session->profile->mrcp_context; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "flush_tts called\n"); - synth_stop(context,tts_session); // TODO + synth_stop(context, tts_session); // TODO } static void openmrcp_text_param_tts(switch_speech_handle_t *sh, char *param, char *val) @@ -774,12 +774,12 @@ if ((profiles = switch_xml_child(cfg, "profiles"))) { for (xprofile = switch_xml_child(profiles, "profile"); xprofile; xprofile = xprofile->next) { const char *profile_name = switch_xml_attr_soft(xprofile, "name"); - mrcp_profile = switch_core_alloc(openmrcp_module.pool,sizeof(openmrcp_profile_t)); + mrcp_profile = switch_core_alloc(openmrcp_module.pool, sizeof(openmrcp_profile_t)); mrcp_profile->mrcp_client = NULL; mrcp_profile->mrcp_context = NULL; mrcp_profile->name = "noname"; if(profile_name) { - mrcp_profile->name = switch_core_strdup(openmrcp_module.pool,profile_name); + mrcp_profile->name = switch_core_strdup(openmrcp_module.pool, profile_name); } mrcp_options = openmrcp_client_options_create(openmrcp_module.pool); @@ -791,9 +791,9 @@ mrcp_options->proto_version =(mrcp_version_t) atoi(val); } else if (!strcasecmp(var, "client_ip")) { - mrcp_options->client_ip = switch_core_strdup(openmrcp_module.pool,val); + mrcp_options->client_ip = switch_core_strdup(openmrcp_module.pool, val); } else if (!strcasecmp(var, "server_ip")) { - mrcp_options->server_ip = switch_core_strdup(openmrcp_module.pool,val); + mrcp_options->server_ip = switch_core_strdup(openmrcp_module.pool, val); } else if (!strcasecmp(var, "client_port")) { mrcp_options->client_port = (apr_port_t) atoi(val); } else if (!strcasecmp(var, "server_port")) { @@ -813,7 +813,7 @@ /* try to set default asr profile */ if (!openmrcp_module.asr_profile) { if (asr_profile_name) { - if (!strcasecmp(mrcp_profile->name,asr_profile_name)) { + if (!strcasecmp(mrcp_profile->name, asr_profile_name)) { openmrcp_module.asr_profile = mrcp_profile; } } @@ -824,7 +824,7 @@ /* try to set default tts profile */ if (!openmrcp_module.tts_profile) { if (tts_profile_name) { - if (!strcasecmp(mrcp_profile->name,tts_profile_name)) { + if (!strcasecmp(mrcp_profile->name, tts_profile_name)) { openmrcp_module.tts_profile = mrcp_profile; } } @@ -858,7 +858,7 @@ /*! Perform one-time initialization of mrcp client library */ - mrcp_event_handler = switch_core_alloc(openmrcp_module.pool,sizeof(mrcp_client_event_handler_t)); + mrcp_event_handler = switch_core_alloc(openmrcp_module.pool, sizeof(mrcp_client_event_handler_t)); mrcp_event_handler->on_session_initiate = openmrcp_on_session_initiate; mrcp_event_handler->on_session_terminate = openmrcp_on_session_terminate; mrcp_event_handler->on_channel_add = openmrcp_on_channel_add; @@ -866,7 +866,7 @@ mrcp_event_handler->on_channel_modify = openmrcp_on_channel_modify; // create client context, which must be passed to client engine - mrcp_context = mrcp_client_context_create(&openmrcp_module,mrcp_event_handler); + mrcp_context = mrcp_client_context_create(&openmrcp_module, mrcp_event_handler); if(!mrcp_context) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mrcp_client_context creation failed\n"); return SWITCH_STATUS_GENERR; @@ -875,7 +875,7 @@ // this basically starts a thread that pulls events from the event queue // and handles them - mrcp_client = openmrcp_client_start(profile->mrcp_options,mrcp_context); + mrcp_client = openmrcp_client_start(profile->mrcp_options, mrcp_context); if(!mrcp_client) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "openmrcp_client_start FAILED\n"); mrcp_client_context_destroy(mrcp_context); @@ -895,7 +895,7 @@ openmrcp_module.asr_profile = NULL; openmrcp_module.tts_profile = NULL; - switch_core_hash_init(&openmrcp_module.profile_hash,openmrcp_module.pool); + switch_core_hash_init(&openmrcp_module.profile_hash, openmrcp_module.pool); /* read config */ if (do_config() != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r5892 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 11:47:15 2007 New Revision: 5892 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: update Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Tue Oct 16 11:47:15 2007 @@ -525,7 +525,8 @@ { mrcp_generic_header_t *generic_header; mrcp_message_t *mrcp_message; - + mrcp_status_t status = MRCP_STATUS_FAILURE; + char *text2speak; const char v2_xml_head[] = "<?xml version=\"1.0\"?>\r\n" @@ -553,28 +554,28 @@ xml_tail = v2_xml_tail; } - - size_t len = sizeof(xml_head) + sizeof(text) + sizeof(xml_tail); - text2speak = (char *) switch_core_alloc(tts_session->pool, len); - strcat(text2speak, xml_head); - strcat(text2speak, text); - strcat(text2speak, xml_tail); - + text2speak = switch_core_sprintf(tts_session->pool, "%s%s%s", xml_head, text, xml_tail); mrcp_message = mrcp_client_context_message_get(context,tts_session->client_session,tts_session->control_channel,SYNTHESIZER_SPEAK); + if(!mrcp_message) { - return MRCP_STATUS_FAILURE; + goto end; } generic_header = mrcp_generic_header_prepare(mrcp_message); if(!generic_header) { - return MRCP_STATUS_FAILURE; + goto end; } generic_header->content_type = "application/synthesis+ssml"; mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE); mrcp_message->body = text2speak; - return mrcp_client_context_channel_modify(context,tts_session->client_session,mrcp_message); + status = mrcp_client_context_channel_modify(context,tts_session->client_session,mrcp_message); + + end: + + return status; + } static mrcp_status_t synth_stop(mrcp_client_context_t *context, openmrcp_session_t *tts_session)

1 0

[commit] r5891 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 11:33:21 2007 New Revision: 5891 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: add pause to speech in openmrcp Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Tue Oct 16 11:33:21 2007 @@ -531,17 +531,17 @@ "<?xml version=\"1.0\"?>\r\n" "<speak>\r\n" "<paragraph>\r\n" - " <sentence>"; + " <sentence><break time=\"1000ms\"/>"; - const char v2_xml_tail[] = "</sentence>\r\n" + const char v2_xml_tail[] = "<break time=\"1000ms\"/></sentence>\r\n" "</paragraph>\r\n" "</speak>\r\n"; const char v1_xml_head[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<speak version=\"1.0\" xmlns=\"http://www.w3.org/2001/10/synthesis\">\n"; + "<speak version=\"1.0\" xmlns=\"http://www.w3.org/2001/10/synthesis\">\n<break time=\"1000ms\"/>"; - const char v1_xml_tail[] = "\n</speak>\n"; + const char v1_xml_tail[] = "<break time=\"1000ms\"/>\n</speak>\n"; const char *xml_head, *xml_tail;

1 0

[commit] r5890 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 11:25:38 2007 New Revision: 5890 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: fix xml to work with v1/voxeo Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Tue Oct 16 11:25:38 2007 @@ -527,16 +527,33 @@ mrcp_message_t *mrcp_message; char *text2speak; - const char xml_head[] = + const char v2_xml_head[] = "<?xml version=\"1.0\"?>\r\n" "<speak>\r\n" "<paragraph>\r\n" " <sentence>"; - const char xml_tail[] = "</sentence>\r\n" + const char v2_xml_tail[] = "</sentence>\r\n" "</paragraph>\r\n" "</speak>\r\n"; + const char v1_xml_head[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<speak version=\"1.0\" xmlns=\"http://www.w3.org/2001/10/synthesis\">\n"; + + + const char v1_xml_tail[] = "\n</speak>\n"; + + const char *xml_head, *xml_tail; + + if (tts_session->profile->mrcp_options->proto_version == 1) { + xml_head = v1_xml_head; + xml_tail = v1_xml_tail; + } else { + xml_head = v2_xml_head; + xml_tail = v2_xml_tail; + } + + size_t len = sizeof(xml_head) + sizeof(text) + sizeof(xml_tail); text2speak = (char *) switch_core_alloc(tts_session->pool, len); strcat(text2speak, xml_head);

1 0

[commit] r5889 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: brian Date: Tue Oct 16 11:10:19 2007 New Revision: 5889 Added: freeswitch/trunk/docs/phrase/ freeswitch/trunk/docs/phrase/phrase_en.xml Log: start of phrase xml file Added: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Tue Oct 16 11:10:19 2007 @@ -0,0 +1,182 @@ +<language param="en"> + <ascii> + <prompt phrase="Space" filename="32.wav"/> + <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="A" filename="97.wav"/> + <prompt phrase="B" filename="98.wav"/> + <prompt phrase="C" filename="99.wav"/> + <prompt phrase="D" filename="100.wav"/> + <prompt phrase="E" filename="101.wav"/> + <prompt phrase="F" filename="102.wav"/> + <prompt phrase="G" filename="103.wav"/> + <prompt phrase="H" filename="104.wav"/> + <prompt phrase="I" filename="105.wav"/> + <prompt phrase="J" filename="106.wav"/> + <prompt phrase="K" filename="107.wav"/> + <prompt phrase="L" filename="108.wav"/> + <prompt phrase="M" filename="109.wav"/> + <prompt phrase="N" filename="110.wav"/> + <prompt phrase="O" filename="111.wav"/> + <prompt phrase="P" filename="112.wav"/> + <prompt phrase="Q" filename="113.wav"/> + <prompt phrase="R" filename="114.wav"/> + <prompt phrase="S" filename="115.wav"/> + <prompt phrase="T" filename="116.wav"/> + <prompt phrase="U" filename="117.wav"/> + <prompt phrase="V" filename="118.wav"/> + <prompt phrase="W" filename="119.wav"/> + <prompt phrase="X" filename="120.wav"/> + <prompt phrase="Y" filename="121.wav"/> + <prompt phrase="Z" filename="122.wav"/> + </ascii> + <phonetic-ascii> + <prompt phrase="Space" filename="32.wav"/> + <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Alpha" filename="97.wav"/> + <prompt phrase="Bravo" filename="98.wav"/> + <prompt phrase="Charlie" filename="99.wav"/> + <prompt phrase="Delta" filename="100.wav"/> + <prompt phrase="Echo" filename="101.wav"/> + <prompt phrase="Foxtrot" filename="102.wav"/> + <prompt phrase="Golf" filename="103.wav"/> + <prompt phrase="Hotel" filename="104.wav"/> + <prompt phrase="India" filename="105.wav"/> + <prompt phrase="Juliet" filename="106.wav"/> + <prompt phrase="Kilo" filename="107.wav"/> + <prompt phrase="Lima" filename="108.wav"/> + <prompt phrase="Mike" filename="109.wav"/> + <prompt phrase="November" filename="110.wav"/> + <prompt phrase="Oscar" filename="111.wav"/> + <prompt phrase="Papa" filename="112.wav"/> + <prompt phrase="Quebec" filename="113.wav"/> + <prompt phrase="Romeo" filename="114.wav"/> + <prompt phrase="Sierra" filename="115.wav"/> + <prompt phrase="Tango" filename="116.wav"/> + <prompt phrase="Unifor" filename="117.wav"/> + <prompt phrase="Victor" filename="118.wav"/> + <prompt phrase="Wiskey" filename="119.wav"/> + <prompt phrase="Xray" filename="120.wav"/> + <prompt phrase="Yankee" filename="121.wav"/> + <prompt phrase="Zulu" filename="122.wav"/> + </phonetic-ascii> + <digits> + <prompt phrase="Zero" filename="0.wav"/> + <prompt phrase="One" filename="1.wav"/> + <prompt phrase="Two" filename="2.wav"/> + <prompt phrase="Three" filename="3.wav"/> + <prompt phrase="Four" filename="4.wav"/> + <prompt phrase="Five" filename="5.wav"/> + <prompt phrase="Six" filename="6.wav"/> + <prompt phrase="Seven" filename="7.wav"/> + <prompt phrase="Eight" filename="8.wav"/> + <prompt phrase="Nine" filename="9.wav"/> + <prompt phrase="Ten" filename="10.wav"/> + <prompt phrase="Eleven" filename="11.wav"/> + <prompt phrase="Twelve" filename="12.wav"/> + <prompt phrase="Thirteen" filename="13.wav"/> + <prompt phrase="Fourteen" filename="14.wav"/> + <prompt phrase="Fifteen" filename="15.wav"/> + <prompt phrase="Sixteen" filename="16.wav"/> + <prompt phrase="Seventeen" filename="17.wav"/> + <prompt phrase="Eightteen" filename="18.wav"/> + <prompt phrase="Nineteen" filename="19.wav"/> + <prompt phrase="Twenty" filename="20.wav"/> + <prompt phrase="Thirty" filename="30.wav"/> + <prompt phrase="Fourty" filename="40.wav"/> + <prompt phrase="Fifty" filename="50.wav"/> + <prompt phrase="Sixty" filename="60.wav"/> + <prompt phrase="Seventy" filename="70.wav"/> + <prompt phrase="Eighty" filename="80.wav"/> + <prompt phrase="Ninety" filename="90.wav"/> + <prompt phrase="Dot" filename="dot.wav"/> + <prompt phrase="First" filename="h-1.wav"/> + <prompt phrase="Second" filename="h-2.wav"/> + <prompt phrase="Third" filename="h-3.wav"/> + <prompt phrase="Fourth" filename="h-4.wav"/> + <prompt phrase="Fifth" filename="h-5.wav"/> + <prompt phrase="Sixth" filename="h-6.wav"/> + <prompt phrase="Seventh" filename="h-7.wav"/> + <prompt phrase="Eighth" filename="h-8.wav"/> + <prompt phrase="Nineth" filename="h-9.wav"/> + <prompt phrase="Tenth" filename="h-10.wav"/> + <prompt phrase="Eleventh" filename="h-11.wav"/> + <prompt phrase="Twelveth" filename="h-12.wav"/> + <prompt phrase="Thirteenth" filename="h-13.wav"/> + <prompt phrase="Fourteenth" filename="h-14.wav"/> + <prompt phrase="Fifteenth" filename="h-15.wav"/> + <prompt phrase="Sixteenth" filename="h-16.wav"/> + <prompt phrase="Seventeenth" filename="h-17.wav"/> + <prompt phrase="Eighteenth" filename="h-18.wav"/> + <prompt phrase="Nineteenth" filename="h-19.wav"/> + <prompt phrase="Twentyth" filename="h-20.wav"/> + <prompt phrase="Thirtyth" filename="h-30.wav"/> + <prompt phrase="Hundred" filename="hundred.wav"/> + <prompt phrase="Million" filename="million.wav"/> + <prompt phrase="Period" filename="period.wav"/> + <prompt phrase="Point" filename="point.wav"/> + <prompt phrase="Pound" filename="pound.wav"/> + <prompt phrase="Star" filename="star.wav"/> + <prompt phrase="Thousand" filename="thousand.wav"/> + </digits> + <currency> + <prompt phrase="And" filename="and.wav"/> + <prompt phrase="Cent" filename="cent.wav"/> + <prompt phrase="Central" filename="central.wav"/> + <prompt phrase="Cents per minute" filename="cents-per-minute.wav"/> + <prompt phrase="Cents" filename="cents.wav"/> + <prompt phrase="Dollar" filename="dollar.wav"/> + <prompt phrase="Dollars" filename="dollars.wav"/> + <prompt phrase="Minus" filename="minus.wav"/> + <prompt phrase="Negative" filename="negative.wav"/> + </currency> + <time> + <prompt phrase="A.M." filename="a-m.wav"/> + <prompt phrase="At" filename="at.wav"/> + <prompt phrase="Sunday" filename="day-0.wav"/> + <prompt phrase="Monday" filename="day-1.wav"/> + <prompt phrase="Tuesday" filename="day-2.wav"/> + <prompt phrase="Wednesday" filename="day-3.wav"/> + <prompt phrase="Thursday" filename="day-4.wav"/> + <prompt phrase="Friday" filename="day-5.wav"/> + <prompt phrase="Saturday" filename="day-6.wav"/> + <prompt phrase="Hour" filename="hour.wav"/> + <prompt phrase="Hours" filename="hours.wav"/> + <prompt phrase="Minute" filename="minute.wav"/> + <prompt phrase="Minutes" filename="minutes.wav"/> + <prompt phrase="January" filename="mon-0.wav"/> + <prompt phrase="Febuary" filename="mon-1.wav"/> + <prompt phrase="March" filename="mon-2.wav"/> + <prompt phrase="April" filename="mon-3.wav"/> + <prompt phrase="May" filename="mon-4.wav"/> + <prompt phrase="June" filename="mon-5.wav"/> + <prompt phrase="July" filename="mon-6.wav"/> + <prompt phrase="August" filename="mon-7.wav"/> + <prompt phrase="September" filename="mon-8.wav"/> + <prompt phrase="October" filename="mon-9.wav"/> + <prompt phrase="November" filename="mon-10.wav"/> + <prompt phrase="Decenber" filename="mon-11.wav"/> + <prompt phrase="O'Clock" filename="oclock.wav"/> + <prompt phrase="oh" filename="oh.wav"/> + <prompt phrase="P.M." filename="p-m.wav"/> + <prompt phrase="Second" filename="second.wav"/> + <prompt phrase="Seconds" filename="seconds.wav"/> + <prompt phrase="Today" filename="today.wav"/> + <prompt phrase="Tomorrow" filename="tomorrow.wav"/> + <prompt phrase="Yesterday" filename="yesterday.wav"/> + </time> + <voicemail> + <prompt phrase="please enter your i d, followed by" filename="vm-enter_id.wav"/> + <prompt phrase="please enter your password, followed by" filename="vm-enter_pass.wav"/> + <prompt phrase="login incorrect" filename="vm-fail_auth.wav"/> + <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> + <prompt phrase="goodbye" filename="vm-goodbye.wav"/> + <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> + <prompt phrase="at the tone, record your name, press any key or stop talking to end the recording." filename="vm-record_name.wav"/> + <prompt phrase="choose a greeting between 1 and 3" filename="vm-choose_greeting.wav"/> + <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> + <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> + <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/> + <prompt phrase="record your message at the tone, press any key or stop talking to end the recording" filename="vm-record_message.wav"/> + <prompt phrase="is not available" filename="vm-play_greeting.wav"/> + </voicemail> +</language> \ No newline at end of file

1 0

[commit] r5888 - in freeswitch/trunk/src: include mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 10:36:39 2007 New Revision: 5888 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add playback_terminators variable This is valid for playback, gentones, record and speak value may be a string of valid terminator characters, or the word 'none' the default of * will always work unless overridden by 'none'. This is for backward compat. <extension name="8000"> <condition field="destination_number" expression="^8000$"> <action application="answer"/>  <action application="set" data="playback_terminators=#*"/> <action application="playback" data="/ram/swimp.raw"/> </condition> </extension> Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 16 10:36:39 2007 @@ -97,6 +97,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_PLAYBACK_TERMINATORS_VARIABLE "playback_terminators" #define SWITCH_CACHE_SPEECH_HANDLES_VARIABLE "cache_speech_handles" #define SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME "__cache_speech_handles_obj__" #define SWITCH_BYPASS_MEDIA_VARIABLE "bypass_media" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Oct 16 10:36:39 2007 @@ -898,15 +898,33 @@ */ static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - + switch (itype) { - case SWITCH_INPUT_TYPE_DTMF:{ + case SWITCH_INPUT_TYPE_DTMF: + { char *dtmf = (char *) input; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digits %s\n", dtmf); + char *terminators; + switch_channel_t *channel = switch_core_session_get_channel(session); + char *p; + + assert(channel); - if (*dtmf == '*') { - return SWITCH_STATUS_BREAK; + if (!(terminators = switch_channel_get_variable(channel, SWITCH_PLAYBACK_TERMINATORS_VARIABLE))) { + terminators = "*"; + } + if (!strcasecmp(terminators, "none")) { + terminators = NULL; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digits %s\n", dtmf); + + for (p = terminators; p && *p; p++) { + char *d; + for (d = dtmf; d && *d; d++) { + if (*p == *d) { + return SWITCH_STATUS_BREAK; + } + } } } break;

1 0

[commit] r5887 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '07

16 Oct '07

Author: anthm Date: Tue Oct 16 10:24:02 2007 New Revision: 5887 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_utils.c Log: add switch_stristr and use it in dptools Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Oct 16 10:24:02 2007 @@ -298,6 +298,8 @@ */ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char **array, int arraylen); +SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); + /*! \brief Escape a string by prefixing a list of characters with an escape character \param pool a memory pool to use Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Oct 16 10:24:02 2007 @@ -1223,7 +1223,7 @@ cause_str = switch_channel_cause2str(cause); snprintf(cause_num, sizeof(cause_num), "%u", cause); - if (switch_true(continue_on_fail) || strstr(cause_str, continue_on_fail) || strstr(cause_str, cause_num)) { + if (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_str, cause_num)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]: Cause: %s\n", continue_on_fail, cause_str); return; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Oct 16 10:24:02 2007 @@ -197,6 +197,27 @@ } +SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr) +{ + size_t score = strlen(str), x = 0; + const char *a = str, *b = instr, *p = NULL; + + while(*a && *b) { + if (tolower(*b) == tolower(*a)) { + if (++x == score) { + return p; + } + a++; + } else { + a = str; + p = b+1; + x = 0; + } + b++; + } + return NULL; +} + SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) { switch_status_t status = SWITCH_STATUS_FALSE;

1 0