<!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][15407] </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=15407">15407</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-11-10 08:57:08 -0600 (Tue, 10 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODAPP-362">MODAPP-362</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodsaymod_say_itmod_say_itc">freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodsaymod_say_itmod_say_itc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c (15406 => 15407)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c 2009-11-10 14:30:54 UTC (rev 15406)
+++ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.c 2009-11-10 14:57:08 UTC (rev 15407)
</span><span class="lines">@@ -95,7 +95,9 @@
</span><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> if (a) {
</span><del>- say_file("digits/%d.wav", a);
</del><ins>+ if (a != 1) {
+ say_file("digits/%d.wav", a);
+ }
</ins><span class="cx"> say_file("digits/hundred.wav");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,7 +153,7 @@
</span><span class="cx"> char *p = in, *q = out;
</span><span class="cx"> char *ret = out;
</span><span class="cx"> switch_size_t x = 0;
</span><del>- // valid are 0 - 9, period (.), minus (-), and plus (+) - remove all others
</del><ins>+ /* valid are 0 - 9, period (.), minus (-), and plus (+) - remove all others */
</ins><span class="cx"> for (; p && *p; p++) {
</span><span class="cx"> if ((*p > 47 && *p < 58) || *p == '.' || *p == '-' || *p == '+') {
</span><span class="cx"> *q++ = *p;
</span><span class="lines">@@ -170,7 +172,7 @@
</span><span class="cx"> char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
</span><span class="cx"> {
</span><span class="cx"> int in;
</span><del>- int x = 0;
</del><ins>+ int places_count = 0;
</ins><span class="cx"> int places[9] = { 0 };
</span><span class="cx"> char sbuf[13] = "";
</span><span class="cx"> switch_status_t status;
</span><span class="lines">@@ -179,26 +181,65 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ /* Get in */
</ins><span class="cx"> in = atoi(tosay);
</span><ins>+
+ /* Check if number too big */
+ if (in > 999999999) {
+ /* Fail */
+ return SWITCH_STATUS_FALSE;
+ }
</ins><span class="cx">
</span><ins>+ /* Check if number isin't zero */
</ins><span class="cx"> if (in != 0) {
</span><del>- for (x = 8; x >= 0; x--) {
- int num = (int) pow(10, x);
- if ((places[(uint32_t) x] = in / num)) {
- in -= places[(uint32_t) x] * num;
- }
- }
-
</del><ins>+
+ /* Init x to 0 */
+ places_count = 0;
+
+ /* Loop until in is greater than zero */
+ do {
+ /* Get last digit */
+ places[places_count] = in % 10;
+
+ /* Drop last digit */
+ in = in / 10;
+ }
+ while(in > 0 && ++places_count > 0 /* fake check to put in while */);
+
</ins><span class="cx"> switch (method) {
</span><span class="cx"> case SSM_COUNTED:
</span><span class="cx"> case SSM_PRONOUNCED:
</span><del>- if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
- return status;
- }
- if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
- return status;
- }
</del><ins>+
+ /* Check for milions */
+ if (places_count > 5) {
+ /* Check if the millions digit is one (digit 6 = 1, digit 7 and 8 = 0) */
+ if (places[6] == 1 && places[7] == 0 && places[8] == 0) {
+ say_file("digits/un.wav");
+ say_file("digits/million.wav");
+ } else {
+ /* Play millions group (digits/million.wav should be digits/millions.wav) */
+ if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
+ return status;
+ }
+ }
+
+ }
+
+ /* Check for thousands */
+ if (places_count > 2) {
+ if (places[3] == 1 && places[4] == 0 && places[5] == 0) {
+ say_file("digits/thousand.wav");
+ } else {
+ /* Play thousand group */
+ if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3],
+ "digits/thousands.wav", session, args)) != SWITCH_STATUS_SUCCESS) {
+ return status;
+ }
+ }
+ }
+
+ /* Play last group */
</ins><span class="cx"> if ((status = play_group(method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="lines">@@ -370,36 +411,19 @@
</span><span class="cx">
</span><span class="cx"> if (say_date) {
</span><span class="cx"> say_file("time/day-%d.wav", tm.tm_wday);
</span><ins>+ say_num(tm.tm_mday, SSM_PRONOUNCED);
</ins><span class="cx"> say_file("time/mon-%d.wav", tm.tm_mon);
</span><del>- say_num(tm.tm_mday, SSM_COUNTED);
</del><span class="cx"> say_num(tm.tm_year + 1900, SSM_PRONOUNCED);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (say_time) {
</span><del>- int32_t hour = tm.tm_hour, pm = 0;
</del><ins>+ say_file("time/hours.wav");
+ say_num(tm.tm_hour, SSM_PRONOUNCED);
</ins><span class="cx">
</span><del>- if (hour > 12) {
- hour -= 12;
- pm = 1;
- } else if (hour == 12) {
- pm = 1;
- } else if (hour == 0) {
- hour = 12;
- pm = 0;
- }
-
- say_num(hour, SSM_PRONOUNCED);
-
- if (tm.tm_min > 9) {
</del><ins>+ if (tm.tm_min) {
+ say_file("time/and.wav");
</ins><span class="cx"> say_num(tm.tm_min, SSM_PRONOUNCED);
</span><del>- } else if (tm.tm_min) {
- say_file("time/oh.wav");
- say_num(tm.tm_min, SSM_PRONOUNCED);
- } else {
- say_file("time/oclock.wav");
</del><span class="cx"> }
</span><del>-
- say_file("time/%s.wav", pm ? "p-m" : "a-m");
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>