<!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][17032] </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=17032">17032</a></dd>
<dt>Author</dt> <dd>tculjaga</dd>
<dt>Date</dt> <dd>2010-03-17 16:17:53 -0500 (Wed, 17 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>it compiles now</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodsaymod_say_hrmod_say_hrc">freeswitch/trunk/src/mod/say/mod_say_hr/mod_say_hr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodsaymod_say_hrmod_say_hrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/say/mod_say_hr/mod_say_hr.c (17031 => 17032)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/say/mod_say_hr/mod_say_hr.c 2010-03-17 16:50:59 UTC (rev 17031)
+++ freeswitch/trunk/src/mod/say/mod_say_hr/mod_say_hr.c 2010-03-17 21:17:53 UTC (rev 17032)
</span><span class="lines">@@ -54,10 +54,15 @@
</span><span class="cx"> #define say_num(num, t, gen) {\
</span><span class="cx"> char tmp[80];\
</span><span class="cx"> switch_status_t tstatus;\
</span><ins>+ switch_say_method_t smeth = say_args->method; \
+ switch_say_type_t stype = say_args->type; \
+ say_args->type = SST_ITEMS; say_args->method = t; \
</ins><span class="cx"> switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \
</span><del>- if ((tstatus = hr_say_count(session, gen, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\
</del><ins>+ if ((tstatus = hr_say_count(session, gen, tmp, say_args, args)) != SWITCH_STATUS_SUCCESS) {\
</ins><span class="cx"> return tstatus;\
</span><del>- }}\
</del><ins>+ } \
+ say_args->method = smeth; say_args->type = stype; \
+}\
</ins><span class="cx">
</span><span class="cx"> #define say_file(...) {\
</span><span class="cx"> char tmp[80];\
</span><span class="lines">@@ -73,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> #define nop
</span><span class="cx">
</span><del>-static switch_status_t hr_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
</del><ins>+static switch_status_t hr_spell(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx"> char *p;
</span><span class="cx">
</span><span class="lines">@@ -82,9 +87,9 @@
</span><span class="cx"> if (a >= 48 && a <= 57) {
</span><span class="cx"> say_file("digits/%d.wav", a - 48);
</span><span class="cx"> } else {
</span><del>- if (type == SST_NAME_SPELLED) {
</del><ins>+ if (say_args->type == SST_NAME_SPELLED) {
</ins><span class="cx"> say_file("ascii/%d.wav", a);
</span><del>- } else if (type == SST_NAME_PHONETIC) {
</del><ins>+ } else if (say_args->type == SST_NAME_PHONETIC) {
</ins><span class="cx"> say_file("phonetic-ascii/%d.wav", a);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -209,7 +214,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t hr_say_count(switch_core_session_t *session, char* gen,
</span><del>- char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
</del><ins>+ char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx"> int in;
</span><span class="cx"> int x = 0;
</span><span class="lines">@@ -242,7 +247,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch (method) {
</del><ins>+ switch (say_args->method) {
</ins><span class="cx"> case SSM_COUNTED:
</span><span class="cx"> case SSM_PRONOUNCED:
</span><span class="cx"> {
</span><span class="lines">@@ -321,7 +326,7 @@
</span><span class="cx"> play_group(SSM_PRONOUNCED, tgen, places[5], places[4], places[3], tisucu, number, session, args)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><del>- if ((status = play_group(method, gen, places[2], places[1], places[0], NULL, number, session, args)) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if ((status = play_group(say_args->method, gen, places[2], places[1], places[0], NULL, number, session, args)) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -345,8 +350,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t hr_say_general_count(switch_core_session_t *session,
- char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
</del><ins>+static switch_status_t hr_say_general_count(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx"> int in;
</span><span class="cx"> int x = 0;
</span><span class="lines">@@ -371,7 +375,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch (method) {
</del><ins>+ switch (say_args->method) {
</ins><span class="cx"> case SSM_COUNTED:
</span><span class="cx"> case SSM_PRONOUNCED:
</span><span class="cx"> if ((status =
</span><span class="lines">@@ -382,7 +386,7 @@
</span><span class="cx"> play_group(SSM_PRONOUNCED, "", places[5], places[4], places[3], "digits/thousand.wav", number, session, args)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><del>- if ((status = play_group(method, "", places[2], places[1], places[0], NULL, number, session, args)) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if ((status = play_group(say_args->method, "", places[2], places[1], places[0], NULL, number, session, args)) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -406,8 +410,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-static switch_status_t hr_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
</del><ins>+static switch_status_t hr_ip(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx"> char *a, *b, *c, *d;
</span><span class="cx"> if (!(a = switch_core_session_strdup(session, tosay))) {
</span><span class="lines">@@ -432,20 +435,20 @@
</span><span class="cx">
</span><span class="cx"> *d++ = '\0';
</span><span class="cx">
</span><del>- say_num(atoi(a), method, "");
</del><ins>+ say_num(atoi(a), say_args->method, "");
</ins><span class="cx"> say_file("digits/dot.wav");
</span><del>- say_num(atoi(b), method, "");
</del><ins>+ say_num(atoi(b), say_args->method, "");
</ins><span class="cx"> say_file("digits/dot.wav");
</span><del>- say_num(atoi(c), method, "");
</del><ins>+ say_num(atoi(c), say_args->method, "");
</ins><span class="cx"> say_file("digits/dot.wav");
</span><del>- say_num(atoi(d), method, "");
</del><ins>+ say_num(atoi(d), say_args->method, "");
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
- switch_input_args_t *args)
</del><ins>+
+static switch_status_t hr_say_time(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx"> int32_t t;
</span><span class="cx"> switch_time_t target = 0, target_now = 0;
</span><span class="lines">@@ -461,7 +464,7 @@
</span><span class="cx"> int sekunda_desetinka = 0;
</span><span class="cx"> int sekunda_jedinica = 0;
</span><span class="cx">
</span><del>- if (type == SST_TIME_MEASUREMENT) {
</del><ins>+ if (say_args->type == SST_TIME_MEASUREMENT) {
</ins><span class="cx"> int64_t hours = 0;
</span><span class="cx"> int64_t minutes = 0;
</span><span class="cx"> int64_t seconds = 0;
</span><span class="lines">@@ -693,7 +696,7 @@
</span><span class="cx"> switch_time_exp_lt(&tm_now, target_now);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch (type) {
</del><ins>+ switch (say_args->type) {
</ins><span class="cx"> case SST_CURRENT_DATE_TIME:
</span><span class="cx"> say_date = say_time = 1;
</span><span class="cx"> break;
</span><span class="lines">@@ -1001,8 +1004,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method,
- switch_input_args_t *args)
</del><ins>+static switch_status_t hr_say_money(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx"> char sbuf[16] = "";
</span><span class="cx"> char *kuna = NULL;
</span><span class="lines">@@ -1050,7 +1052,7 @@
</span><span class="cx">
</span><span class="cx"> if (predzadnja_kuna == 1)
</span><span class="cx"> {
</span><del>- hr_say_count(session, "", kuna, type, method, args);
</del><ins>+ hr_say_count(session, "", kuna, say_args, args);
</ins><span class="cx"> say_file("currency/kuna.wav");
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="lines">@@ -1058,7 +1060,7 @@
</span><span class="cx"> switch(zadnja_kuna)
</span><span class="cx"> {
</span><span class="cx"> case 1:
</span><del>- hr_say_count(session, "a", kuna, type, method, args);
</del><ins>+ hr_say_count(session, "a", kuna, say_args, args);
</ins><span class="cx"> say_file("currency/kuna.wav");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -1068,18 +1070,18 @@
</span><span class="cx"> case 7:
</span><span class="cx"> case 8:
</span><span class="cx"> case 9:
</span><del>- hr_say_count(session, "", kuna, type, method, args);
</del><ins>+ hr_say_count(session, "", kuna, say_args, args);
</ins><span class="cx"> say_file("currency/kuna.wav");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 2:
</span><del>- hr_say_count(session, "je", kuna, type, method, args);
</del><ins>+ hr_say_count(session, "je", kuna, say_args, args);
</ins><span class="cx"> say_file("currency/kune.wav");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 3:
</span><span class="cx"> case 4:
</span><del>- hr_say_count(session, "", kuna, type, method, args);
</del><ins>+ hr_say_count(session, "", kuna, say_args, args);
</ins><span class="cx"> say_file("currency/kune.wav");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1106,7 +1108,7 @@
</span><span class="cx">
</span><span class="cx"> if (predzadnja_lipa == 1)
</span><span class="cx"> {
</span><del>- hr_say_count(session, "", lipa, type, method, args);
</del><ins>+ hr_say_count(session, "", lipa, say_args, args);
</ins><span class="cx"> say_file("currency/lipa.wav");
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="lines">@@ -1114,7 +1116,7 @@
</span><span class="cx"> switch(zadnja_lipa)
</span><span class="cx"> {
</span><span class="cx"> case 1:
</span><del>- hr_say_count(session, "a", lipa, type, method, args);
</del><ins>+ hr_say_count(session, "a", lipa, say_args, args);
</ins><span class="cx"> say_file("currency/lipa.wav");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -1124,18 +1126,18 @@
</span><span class="cx"> case 7:
</span><span class="cx"> case 8:
</span><span class="cx"> case 9:
</span><del>- hr_say_count(session, "", lipa, type, method, args);
</del><ins>+ hr_say_count(session, "", lipa, say_args, args);
</ins><span class="cx"> say_file("currency/lipa.wav");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 2:
</span><del>- hr_say_count(session, "je", lipa, type, method, args);
</del><ins>+ hr_say_count(session, "je", lipa, say_args, args);
</ins><span class="cx"> say_file("currency/lipa.wav");
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 3:
</span><span class="cx"> case 4:
</span><del>- hr_say_count(session, "", lipa, type, method, args);
</del><ins>+ hr_say_count(session, "", lipa, say_args, args);
</ins><span class="cx"> say_file("currency/lipe.wav");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1147,12 +1149,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-static switch_status_t hr_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args)
</del><ins>+static switch_status_t hr_say(switch_core_session_t *session, char *tosay, switch_say_args_t *say_args, switch_input_args_t *args)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> switch_say_callback_t say_cb = NULL;
</span><span class="cx">
</span><del>- switch (type) {
</del><ins>+ switch (say_args->type) {
</ins><span class="cx"> case SST_NUMBER:
</span><span class="cx"> case SST_ITEMS:
</span><span class="cx"> case SST_PERSONS:
</span><span class="lines">@@ -1177,12 +1179,12 @@
</span><span class="cx"> say_cb = hr_say_money;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", say_args->type);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (say_cb) {
</span><del>- return say_cb(session, tosay, type, method, args);
</del><ins>+ return say_cb(session, tosay, say_args, args);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>