<!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][16042] </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=16042">16042</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-23 10:54:20 -0600 (Wed, 23 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix duplicate definition of ms_to_samples (update to <a href="http://jira.freeswitch.org/browse/spandsp-20091223">spandsp-20091223</a> snapshot)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsspandspupdate">freeswitch/trunk/libs/spandsp/.update</a></li>
<li><a href="#freeswitchtrunklibsspandspsrcat_interpreterc">freeswitch/trunk/libs/spandsp/src/at_interpreter.c</a></li>
<li><a href="#freeswitchtrunklibsspandspsrcbell_r2_mfc">freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c</a></li>
<li><a href="#freeswitchtrunklibsspandspsrcplcc">freeswitch/trunk/libs/spandsp/src/plc.c</a></li>
<li><a href="#freeswitchtrunklibsspandspsrcspandspversionh">freeswitch/trunk/libs/spandsp/src/spandsp/version.h</a></li>
<li><a href="#freeswitchtrunklibsspandspsrct30c">freeswitch/trunk/libs/spandsp/src/t30.c</a></li>
<li><a href="#freeswitchtrunklibsspandspsrctone_generatec">freeswitch/trunk/libs/spandsp/src/tone_generate.c</a></li>
<li><a href="#freeswitchtrunklibsspandspsrcv8c">freeswitch/trunk/libs/spandsp/src/v8.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsspandspupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/.update (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/.update 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/.update 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Tue Dec 22 20:40:14 EST 2009
</del><ins>+Wed Dec 23 11:53:35 EST 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibsspandspsrcat_interpreterc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/at_interpreter.c (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/at_interpreter.c 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/at_interpreter.c 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> * License along with this program; if not, write to the Free Software
</span><span class="cx"> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</span><span class="cx"> *
</span><del>- * $Id: at_interpreter.c,v 1.42 2009/10/09 14:53:56 steveu Exp $
</del><ins>+ * $Id: at_interpreter.c,v 1.42.4.1 2009/12/23 14:18:32 steveu Exp $
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*! \file */
</span><span class="lines">@@ -64,8 +64,6 @@
</span><span class="cx"> #include "spandsp/private/logging.h"
</span><span class="cx"> #include "spandsp/private/at_interpreter.h"
</span><span class="cx">
</span><del>-#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
-
</del><span class="cx"> #define MANUFACTURER "www.soft-switch.org"
</span><span class="cx"> #define SERIAL_NUMBER "42"
</span><span class="cx"> #define GLOBAL_OBJECT_IDENTITY "42"
</span></span></pre></div>
<a id="freeswitchtrunklibsspandspsrcbell_r2_mfc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/bell_r2_mf.c 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * License along with this program; if not, write to the Free Software
</span><span class="cx"> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</span><span class="cx"> *
</span><del>- * $Id: bell_r2_mf.c,v 1.39 2009/04/11 18:11:19 steveu Exp $
</del><ins>+ * $Id: bell_r2_mf.c,v 1.39.4.1 2009/12/23 14:23:48 steveu Exp $
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*! \file */
</span><span class="lines">@@ -65,8 +65,6 @@
</span><span class="cx"> #define M_PI 3.14159265358979323846264338327
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
-
</del><span class="cx"> /*!
</span><span class="cx"> MF tone descriptor.
</span><span class="cx"> */
</span></span></pre></div>
<a id="freeswitchtrunklibsspandspsrcplcc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/plc.c (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/plc.c 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/plc.c 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * License along with this program; if not, write to the Free Software
</span><span class="cx"> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</span><span class="cx"> *
</span><del>- * $Id: plc.c,v 1.27 2009/02/10 13:06:46 steveu Exp $
</del><ins>+ * $Id: plc.c,v 1.27.4.1 2009/12/23 14:23:49 steveu Exp $
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*! \file */
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx"> /* We do a straight line fade to zero volume in 50ms when we are filling in for missing data. */
</span><span class="cx"> #define ATTENUATION_INCREMENT 0.0025f /* Attenuation per sample */
</span><span class="cx">
</span><del>-#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
-
</del><span class="cx"> static void save_history(plc_state_t *s, int16_t *buf, int len)
</span><span class="cx"> {
</span><span class="cx"> if (len >= PLC_HISTORY_LEN)
</span></span></pre></div>
<a id="freeswitchtrunklibsspandspsrcspandspversionh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/spandsp/version.h 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx">
</span><span class="cx"> /* The date and time of the version are in UTC form. */
</span><span class="cx">
</span><del>-#define SPANDSP_RELEASE_DATE 20091221
-#define SPANDSP_RELEASE_TIME 183911
-#define SPANDSP_RELEASE_DATETIME_STRING "20091221 183911"
</del><ins>+#define SPANDSP_RELEASE_DATE 20091223
+#define SPANDSP_RELEASE_TIME 143600
+#define SPANDSP_RELEASE_DATETIME_STRING "20091223 143600"
</ins><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx"> /*- End of file ------------------------------------------------------------*/
</span></span></pre></div>
<a id="freeswitchtrunklibsspandspsrct30c"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/t30.c (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/t30.c 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/t30.c 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * License along with this program; if not, write to the Free Software
</span><span class="cx"> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</span><span class="cx"> *
</span><del>- * $Id: t30.c,v 1.305.4.3 2009/12/19 14:18:12 steveu Exp $
</del><ins>+ * $Id: t30.c,v 1.305.4.4 2009/12/23 14:23:49 steveu Exp $
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*! \file */
</span><span class="lines">@@ -84,9 +84,6 @@
</span><span class="cx"> terminal could keep you retrying all day. Its a backstop protection. */
</span><span class="cx"> #define MAX_RESPONSE_TRIES 6
</span><span class="cx">
</span><del>-/*! Conversion between milliseconds and audio samples. */
-#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
-
</del><span class="cx"> /* T.30 defines the following call phases:
</span><span class="cx"> Phase A: Call set-up.
</span><span class="cx"> Exchange of CNG, CED and the called terminal identification.
</span></span></pre></div>
<a id="freeswitchtrunklibsspandspsrctone_generatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/tone_generate.c (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/tone_generate.c 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/tone_generate.c 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * License along with this program; if not, write to the Free Software
</span><span class="cx"> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</span><span class="cx"> *
</span><del>- * $Id: tone_generate.c,v 1.53 2009/06/02 16:03:56 steveu Exp $
</del><ins>+ * $Id: tone_generate.c,v 1.53.4.1 2009/12/23 14:23:49 steveu Exp $
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*! \file */
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> #define M_PI 3.14159265358979323846264338327
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
-
</del><span class="cx"> SPAN_DECLARE(void) make_tone_gen_descriptor(tone_gen_descriptor_t *s,
</span><span class="cx"> int f1,
</span><span class="cx"> int l1,
</span></span></pre></div>
<a id="freeswitchtrunklibsspandspsrcv8c"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/spandsp/src/v8.c (16041 => 16042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/spandsp/src/v8.c 2009-12-23 03:44:42 UTC (rev 16041)
+++ freeswitch/trunk/libs/spandsp/src/v8.c 2009-12-23 16:54:20 UTC (rev 16042)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * License along with this program; if not, write to the Free Software
</span><span class="cx"> * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</span><span class="cx"> *
</span><del>- * $Id: v8.c,v 1.42 2009/11/04 16:10:14 steveu Exp $
</del><ins>+ * $Id: v8.c,v 1.42.4.1 2009/12/23 14:23:49 steveu Exp $
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*! \file */
</span><span class="lines">@@ -63,8 +63,6 @@
</span><span class="cx"> #include "spandsp/private/modem_connect_tones.h"
</span><span class="cx"> #include "spandsp/private/v8.h"
</span><span class="cx">
</span><del>-#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
-
</del><span class="cx"> enum
</span><span class="cx"> {
</span><span class="cx"> V8_WAIT_1S,
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>