<!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][14886] </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=14886">14886</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2009-09-16 12:48:55 -0500 (Wed, 16 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_tts_commandline: cut samples in half (suggested by anthm), ajust and clean log levels
<cite>
[19:32] <@anthm> the tts stuff uses bytes not samples
[19:32] <@anthm> so when you pass datalen to file_read
[19:32] <@anthm> you need to cut it in half
[19:33] <@anthm> size_t my_datalen = *datalen / 2;
[19:33] <sathieu> I'm testing
[19:33] <@anthm> switch_core_file_read(&info->fh, data, datalen)
[19:33] <@anthm> change datalen to &my_datalen
[19:33] <@anthm> then after *datalen = my_datalen * 2;
</cite></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec">freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodasr_ttsmod_tts_commandlinemod_tts_commandlinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c (14885 => 14886)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-16 17:34:24 UTC (rev 14885)
+++ freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c 2009-09-16 17:48:55 UTC (rev 14886)
</span><span class="lines">@@ -85,21 +85,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (event->event_id == SWITCH_EVENT_RELOADXML) {
</span><span class="cx"> if (load_tts_commandline_config() != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to reload config file\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to reload config file\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t tts_commandline_speech_open(switch_speech_handle_t *sh, const char *voice_name, int rate, switch_speech_flag_t *flags)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "tts_commandline_speech_open(?,%s,%d,%u)\n",voice_name,rate, *flags);
-
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
- "speech_handle: name = %s, rate = %d, speed = %d, samples = %d, voice = %s, engine = %s, param = %s\n",
- sh->name, sh->rate, sh->speed, sh->samples, sh->voice, sh->engine, sh->param);
-
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "voice = %s, rate = %d\n", voice_name, rate);
-
</del><span class="cx"> tts_commandline_t *info = switch_core_alloc(sh->memory_pool, sizeof(*info));
</span><span class="cx">
</span><span class="cx"> info->voice_name = switch_core_strdup(sh->memory_pool, voice_name);
</span><span class="lines">@@ -122,8 +114,6 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t tts_commandline_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "tts_commandline_speech_feed_tts(?,%s,%u)\n", text, *flags);
-
</del><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><span class="lines">@@ -135,10 +125,10 @@
</span><span class="cx"> rate = switch_core_sprintf(sh->memory_pool, "%d", info->rate);
</span><span class="cx"> message = switch_string_replace(message, "${rate}", rate);
</span><span class="cx"> message = switch_string_replace(message, "${file}", info->file);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Executing: %s\n", message);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing: %s\n", message);
</ins><span class="cx">
</span><span class="cx"> if (switch_system(message, SWITCH_TRUE) < 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", message);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to execute command: %s\n", message);
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,26 +137,10 @@
</span><span class="cx"> 0, //number_of_channels,
</span><span class="cx"> 0, //samples_per_second,
</span><span class="cx"> SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to open file: %s\n", info->file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file: %s\n", info->file);
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // sh->rate = info->fh.samplerate;
- // sh->speed = info->fh.speed;
- // sh->samples = info->fh.samples;
- // sh->samplerate = info->fh.samplerate / 2;
- // sh->native_rate = info->fh.native_rate;
-
- // info->fh.speed = sh->speed;
- // info->fh.samples = sh->samples;
- // info->fh.samplerate = sh->samplerate;
-
-
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
- "File handle info: flags=%u, samples=%u,samplerate=%u,native_rate=%u,channels=%u,format=%u,sections=%u,seekable=%u,sample_count=%u,speed=%u\n",
- info->fh.flags, info->fh.samples, info->fh.samplerate, info->fh.native_rate, info->fh.channels,
- info->fh.format, info->fh.sections, info->fh.seekable, info->fh.sample_count, info->fh.speed);
-
</del><span class="cx"> sh->private_info = info;
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -177,10 +151,13 @@
</span><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><del>- if (switch_core_file_read(&info->fh, data, datalen) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "done\n");
</del><ins>+ size_t my_datalen = *datalen / 2;
+
+ if (switch_core_file_read(&info->fh, data, &my_datalen) != SWITCH_STATUS_SUCCESS) {
+ *datalen = my_datalen * 2;
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><ins>+ *datalen = my_datalen * 2;
</ins><span class="cx"> if(datalen == 0) {
</span><span class="cx"> return SWITCH_STATUS_BREAK;
</span><span class="cx"> } else {
</span><span class="lines">@@ -201,8 +178,6 @@
</span><span class="cx">
</span><span class="cx"> static void tts_commandline_text_param_tts(switch_speech_handle_t *sh, char *param, const char *val)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "tts_commandline_text_param_tts(?,%s,%s)\n", param, val);
-
</del><span class="cx"> tts_commandline_t *info = (tts_commandline_t *) sh->private_info;
</span><span class="cx"> assert(info != NULL);
</span><span class="cx">
</span><span class="lines">@@ -213,12 +188,10 @@
</span><span class="cx">
</span><span class="cx"> static void tts_commandline_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "tts_commandline_numeric_param_tts(?,%s,%d)\n", param, val);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void tts_commandline_float_param_tts(switch_speech_handle_t *sh, char *param, double val)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "tts_commandline_numeric_param_tts(?,%s,%e)\n", param, val);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_tts_commandline_load)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>