<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16718] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16718">16718</a></dd>
<dt>Author</dt> <dd>crienzo</dd>
<dt>Date</dt> <dd>2010-02-22 09:19:52 -0600 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove support for old version of UniMRCP</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc">freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (16717 => 16718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2010-02-22 14:26:16 UTC (rev 16717)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2010-02-22 15:19:52 UTC (rev 16718)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
</span><del>- * Copyright (C) 2009, Anthony Minessale II <anthm@freeswitch.org>
</del><ins>+ * Copyright (C) 2009-2010, Anthony Minessale II <anthm@freeswitch.org>
</ins><span class="cx"> *
</span><span class="cx"> * Version: MPL 1.1
</span><span class="cx"> *
</span><span class="lines">@@ -45,11 +45,7 @@
</span><span class="cx"> #include "mrcp_recog_header.h"
</span><span class="cx"> #include "mrcp_recog_resource.h"
</span><span class="cx"> #include "uni_version.h"
</span><del>-#if UNI_VERSION_AT_LEAST(0,8,0)
</del><span class="cx"> #include "mrcp_resource_loader.h"
</span><del>-#else
-#include "mrcp_default_factory.h"
-#endif
</del><span class="cx"> #include "mpf_engine.h"
</span><span class="cx"> #include "mpf_codec_manager.h"
</span><span class="cx"> #include "mpf_rtp_termination_factory.h"
</span><span class="lines">@@ -860,7 +856,6 @@
</span><span class="cx"> * @param schannel the speech channel
</span><span class="cx"> * @return the termination or NULL
</span><span class="cx"> */
</span><del>-#if UNI_VERSION_AT_LEAST(0,8,0)
</del><span class="cx"> static mpf_termination_t *speech_channel_create_mpf_termination(speech_channel_t *schannel)
</span><span class="cx"> {
</span><span class="cx"> mpf_termination_t *termination = NULL;
</span><span class="lines">@@ -890,30 +885,7 @@
</span><span class="cx">
</span><span class="cx"> return termination;
</span><span class="cx"> }
</span><del>-#else
-static mpf_termination_t *speech_channel_create_mpf_termination(speech_channel_t *schannel)
-{
- mpf_termination_t *termination = NULL;
- mpf_codec_descriptor_t *codec = NULL;
- codec = (mpf_codec_descriptor_t *) apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
- mpf_codec_descriptor_init(codec);
- codec->channel_count = 1;
- codec->payload_type = 96;
- codec->sampling_rate = schannel->rate;
- apt_string_set(&codec->name, "LPCM"); /* "LPCM" is UniMRCP's name for L16 host byte ordered */
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec LPCM/%d/%d\n", schannel->name, codec->payload_type,
- codec->sampling_rate);
</del><span class="cx">
</span><del>- if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
- termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
- } else {
- termination = mrcp_application_source_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
- }
-
- return termination;
-}
-#endif
-
</del><span class="cx"> /**
</span><span class="cx"> * Open the speech channel
</span><span class="cx"> *
</span><span class="lines">@@ -1750,7 +1722,6 @@
</span><span class="cx">
</span><span class="cx"> /* check status */
</span><span class="cx"> if (session && schannel && status == MRCP_SIG_STATUS_CODE_SUCCESS) {
</span><del>-#if UNI_VERSION_AT_LEAST(0,8,0)
</del><span class="cx"> char codec_name[60] = { 0 };
</span><span class="cx"> const mpf_codec_descriptor_t *descriptor;
</span><span class="cx"> /* what sample rate did we negotiate? */
</span><span class="lines">@@ -1765,10 +1736,6 @@
</span><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s channel is ready, codec = %s, sample rate = %d\n", schannel->name,
</span><span class="cx"> speech_channel_type_to_string(schannel->type), codec_name, schannel->rate);
</span><del>-#else
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is ready\n", schannel->name,
- speech_channel_type_to_string(schannel->type));
-#endif
</del><span class="cx"> speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
</span><span class="cx"> /* notify of channel open */
</span><span class="cx"> if (globals.enable_profile_events && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_PROFILE_OPEN) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -3431,7 +3398,6 @@
</span><span class="cx"> }
</span><span class="cx"> } else if (strcasecmp(param, "ptime") == 0) {
</span><span class="cx"> rtp_config->ptime = (apr_uint16_t) atol(val);
</span><del>-#if UNI_VERSION_AT_LEAST(0,8,0)
</del><span class="cx"> } else if (strcasecmp(param, "rtcp") == 0) {
</span><span class="cx"> rtp_config->rtcp = atoi(val);
</span><span class="cx"> } else if (strcasecmp(param, "rtcp-bye") == 0) {
</span><span class="lines">@@ -3440,7 +3406,6 @@
</span><span class="cx"> rtp_config->rtcp_tx_interval = (apr_uint16_t) atoi(val);
</span><span class="cx"> } else if (strcasecmp(param, "rtcp-rx-resolution") == 0) {
</span><span class="cx"> rtp_config->rtcp_rx_resolution = (apr_uint16_t) atol(val);
</span><del>-#endif
</del><span class="cx"> } else {
</span><span class="cx"> mine = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -3530,9 +3495,7 @@
</span><span class="cx"> switch_xml_t cfg = NULL, xml = NULL, profiles = NULL, profile = NULL;
</span><span class="cx"> mrcp_client_t *client = NULL;
</span><span class="cx"> apr_pool_t *pool = NULL;
</span><del>-#if UNI_VERSION_AT_LEAST(0,8,0)
</del><span class="cx"> mrcp_resource_loader_t *resource_loader = NULL;
</span><del>-#endif
</del><span class="cx"> mrcp_resource_factory_t *resource_factory = NULL;
</span><span class="cx"> mpf_codec_manager_t *codec_manager = NULL;
</span><span class="cx"> apr_size_t max_connection_count = 0;
</span><span class="lines">@@ -3555,7 +3518,7 @@
</span><span class="cx"> client = NULL;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>-#if UNI_VERSION_AT_LEAST(0,8,0)
</del><ins>+
</ins><span class="cx"> /* load the synthesizer and recognizer resources */
</span><span class="cx"> resource_loader = mrcp_resource_loader_create(FALSE, pool);
</span><span class="cx"> if (resource_loader) {
</span><span class="lines">@@ -3571,16 +3534,6 @@
</span><span class="cx"> client = NULL;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>-#else
- /* load resources */
- resource_factory = mrcp_default_factory_create(pool);
- if (resource_factory) {
- mrcp_client_resource_factory_register(client, resource_factory);
- } else {
- client = NULL;
- goto done;
- }
-#endif
</del><span class="cx">
</span><span class="cx"> codec_manager = mpf_engine_codec_manager_create(pool);
</span><span class="cx"> if (codec_manager) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>