fix duplicate definition of ms_to_samples (update to spandsp-20091223 snapshot)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16042 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
parent
dc5d69c104
commit
b84f3086a8
|
|
@ -1 +1 @@
|
|||
Tue Dec 22 20:40:14 EST 2009
|
||||
Wed Dec 23 11:53:35 EST 2009
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: at_interpreter.c,v 1.42 2009/10/09 14:53:56 steveu Exp $
|
||||
* $Id: at_interpreter.c,v 1.42.4.1 2009/12/23 14:18:32 steveu Exp $
|
||||
*/
|
||||
|
||||
/*! \file */
|
||||
|
|
@ -64,8 +64,6 @@
|
|||
#include "spandsp/private/logging.h"
|
||||
#include "spandsp/private/at_interpreter.h"
|
||||
|
||||
#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
|
||||
|
||||
#define MANUFACTURER "www.soft-switch.org"
|
||||
#define SERIAL_NUMBER "42"
|
||||
#define GLOBAL_OBJECT_IDENTITY "42"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: bell_r2_mf.c,v 1.39 2009/04/11 18:11:19 steveu Exp $
|
||||
* $Id: bell_r2_mf.c,v 1.39.4.1 2009/12/23 14:23:48 steveu Exp $
|
||||
*/
|
||||
|
||||
/*! \file */
|
||||
|
|
@ -65,8 +65,6 @@
|
|||
#define M_PI 3.14159265358979323846264338327
|
||||
#endif
|
||||
|
||||
#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
|
||||
|
||||
/*!
|
||||
MF tone descriptor.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: plc.c,v 1.27 2009/02/10 13:06:46 steveu Exp $
|
||||
* $Id: plc.c,v 1.27.4.1 2009/12/23 14:23:49 steveu Exp $
|
||||
*/
|
||||
|
||||
/*! \file */
|
||||
|
|
@ -52,8 +52,6 @@
|
|||
/* We do a straight line fade to zero volume in 50ms when we are filling in for missing data. */
|
||||
#define ATTENUATION_INCREMENT 0.0025f /* Attenuation per sample */
|
||||
|
||||
#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
|
||||
|
||||
static void save_history(plc_state_t *s, int16_t *buf, int len)
|
||||
{
|
||||
if (len >= PLC_HISTORY_LEN)
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@
|
|||
|
||||
/* The date and time of the version are in UTC form. */
|
||||
|
||||
#define SPANDSP_RELEASE_DATE 20091221
|
||||
#define SPANDSP_RELEASE_TIME 183911
|
||||
#define SPANDSP_RELEASE_DATETIME_STRING "20091221 183911"
|
||||
#define SPANDSP_RELEASE_DATE 20091223
|
||||
#define SPANDSP_RELEASE_TIME 143600
|
||||
#define SPANDSP_RELEASE_DATETIME_STRING "20091223 143600"
|
||||
|
||||
#endif
|
||||
/*- End of file ------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: t30.c,v 1.305.4.3 2009/12/19 14:18:12 steveu Exp $
|
||||
* $Id: t30.c,v 1.305.4.4 2009/12/23 14:23:49 steveu Exp $
|
||||
*/
|
||||
|
||||
/*! \file */
|
||||
|
|
@ -84,9 +84,6 @@
|
|||
terminal could keep you retrying all day. Its a backstop protection. */
|
||||
#define MAX_RESPONSE_TRIES 6
|
||||
|
||||
/*! Conversion between milliseconds and audio samples. */
|
||||
#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
|
||||
|
||||
/* T.30 defines the following call phases:
|
||||
Phase A: Call set-up.
|
||||
Exchange of CNG, CED and the called terminal identification.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: tone_generate.c,v 1.53 2009/06/02 16:03:56 steveu Exp $
|
||||
* $Id: tone_generate.c,v 1.53.4.1 2009/12/23 14:23:49 steveu Exp $
|
||||
*/
|
||||
|
||||
/*! \file */
|
||||
|
|
@ -59,8 +59,6 @@
|
|||
#define M_PI 3.14159265358979323846264338327
|
||||
#endif
|
||||
|
||||
#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
|
||||
|
||||
SPAN_DECLARE(void) make_tone_gen_descriptor(tone_gen_descriptor_t *s,
|
||||
int f1,
|
||||
int l1,
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* License along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: v8.c,v 1.42 2009/11/04 16:10:14 steveu Exp $
|
||||
* $Id: v8.c,v 1.42.4.1 2009/12/23 14:23:49 steveu Exp $
|
||||
*/
|
||||
|
||||
/*! \file */
|
||||
|
|
@ -63,8 +63,6 @@
|
|||
#include "spandsp/private/modem_connect_tones.h"
|
||||
#include "spandsp/private/v8.h"
|
||||
|
||||
#define ms_to_samples(t) (((t)*SAMPLE_RATE)/1000)
|
||||
|
||||
enum
|
||||
{
|
||||
V8_WAIT_1S,
|
||||
|
|
|
|||
Loading…
Reference in New Issue