ref: b8f3fe0141dec705fc4389c6d700240da1041bfc
parent: 1939c772176acadcf7012703b0b378aebb1b8cb7
author: Erik de Castro Lopo <[email protected]>
date: Sat Jan 31 05:52:19 EST 2004
Pull updates across from CVS.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-26 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+
+ * src/common.h
+ Changed allowed SRC ration to range [1/256, 256].
+
+ * configure.ac tests/snr_bw_test.c tests/src-evaluate.c tests/Makefile.am
+ Use FFTW3 instead of version 2.
+
2003-12-14 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* doc/api.html doc/api_misc.html
--- a/Win32/Makefile.am
+++ b/Win32/Makefile.am
@@ -1,2 +1,9 @@
EXTRA_DIST = Makefile.msvc config.h unistd.h libsamplerate.def
+
+## Do not edit or modify anything in this comment block.
+## The arch-tag line is a file identity tag for the GNU Arch
+## revision control system.
+##
+## arch-tag: fcba51ab-858b-462c-9954-66fee32b7f8f
+
--- a/Win32/config.h
+++ b/Win32/config.h
@@ -45,7 +45,6 @@
*/
/* Set to 1 if the compile is GNU GCC. */
-<<<<<<< diff from left file
#define COMPILER_IS_GCC 0
========
#define COMPILER_IS_GCC 1
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2002,2003 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
+# Copyright (C) 2002-2004 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
dnl Require autoconf version >= 2.54)
AC_PREREQ(2.54)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -23,3 +23,10 @@
varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS)
+
+## Do not edit or modify anything in this comment block.
+## The arch-tag line is a file identity tag for the GNU Arch
+## revision control system.
+##
+## arch-tag: 25f669d6-3eeb-4093-8c16-2b03df642795
+
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,3 +18,10 @@
# Disable autoheader.
AUTOHEADER=echo
+
+## Do not edit or modify anything in this comment block.
+## The arch-tag line is a file identity tag for the GNU Arch
+## revision control system.
+##
+## arch-tag: 62db1d8d-493b-4874-afb0-e421d3dbb868
+
--- a/src/common.h
+++ b/src/common.h
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 2002,2003 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 2002-2004 Erik de Castro Lopo <[email protected]>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,3 +58,8 @@
@echo " ${PACKAGE}-${VERSION} passed all tests."@echo "-----------------------------------------------------------------"
+# Do not edit or modify anything in this comment block.
+# The arch-tag line is a file identity tag for the GNU Arch
+# revision control system.
+#
+# arch-tag: ec9d19f8-523c-48e5-8929-809c2641a8dc
--- a/tests/snr_bw_test.c
+++ b/tests/snr_bw_test.c
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 2002,2003 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 2002-2004 Erik de Castro Lopo <[email protected]>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -428,6 +428,7 @@
} /* main */
#endif
+
/*
** Do not edit or modify anything in this comment block.
** The arch-tag line is a file identity tag for the GNU Arch
--- a/tests/src-evaluate.c
+++ b/tests/src-evaluate.c
@@ -27,7 +27,7 @@
#include "config.h"
-#if (HAVE_LIBFFTW && HAVE_LIBRFFTW && HAVE_SNDFILE)
+#if (HAVE_FFTW3 && HAVE_SNDFILE)
#include <sndfile.h>
#include <math.h>
@@ -532,7 +532,8 @@
return 0 ;
} /* main */
-#endif /* (HAVE_LIBFFTW && HAVE_LIBRFFTW && HAVE_SNDFILE) */
+#endif /* (HAVE_FFTW3 && HAVE_SNDFILE) */
+
/*
** Do not edit or modify anything in this comment block.
** The arch-tag line is a file identity tag for the GNU Arch