History

Pull updates across from CVS.

Erik de Castro Lopo committed 22 years ago

Commit b8f3fe01 parent 1939c7710 files · +41 −6Browse files

Unified · Split

10 files
  1. ChangeLog +8 −0
  2. Win32/Makefile.am +7 −0
  3. Win32/config.h +0 −1
  4. configure.ac +1 −1
  5. examples/Makefile.am +7 −0
  6. src/Makefile.am +7 −0
  7. src/common.h +1 −1
  8. tests/Makefile.am +5 −0
  9. tests/snr_bw_test.c +2 −1
  10. tests/src-evaluate.c +3 −2
ChangeLog+8−0
@@ -1,3 +1,11 @@
1+2004-01-26 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
2+
3+ * src/common.h
4+ Changed allowed SRC ration to range [1/256, 256].
5+
6+ * configure.ac tests/snr_bw_test.c tests/src-evaluate.c tests/Makefile.am
7+ Use FFTW3 instead of version 2.
8+
19 2003-12-14 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
210
311 * doc/api.html doc/api_misc.html
Win32/Makefile.am+7−0
@@ -1,2 +1,9 @@
11 EXTRA_DIST = Makefile.msvc config.h unistd.h libsamplerate.def
22
3+
4+## Do not edit or modify anything in this comment block.
5+## The arch-tag line is a file identity tag for the GNU Arch
6+## revision control system.
7+##
8+## arch-tag: fcba51ab-858b-462c-9954-66fee32b7f8f
9+
Win32/config.h+0−1
@@ -45,7 +45,6 @@ · 44 unmodified lines
4545 */
4646
4747 /* Set to 1 if the compile is GNU GCC. */
48−<<<<<<< diff from left file
4948 #define COMPILER_IS_GCC 0
5049 ========
5150 #define COMPILER_IS_GCC 1
configure.ac+1−1
@@ -1,4 +1,4 @@
1−# Copyright (C) 2002,2003 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
1+# Copyright (C) 2002-2004 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
22
33 dnl Require autoconf version >= 2.54)
44 AC_PREREQ(2.54)
examples/Makefile.am+7−0
@@ -23,3 +23,10 @@ varispeed_play_CFLAGS = @SNDFILE_CFLAGS@ · 22 unmodified lines
2323 varispeed_play_LDADD = $(SAMPLERATEDIR)/libsamplerate.la $(SNDFILE_LIBS) $(OS_SPECIFIC_LINKS)
2424
2525
26+
27+## Do not edit or modify anything in this comment block.
28+## The arch-tag line is a file identity tag for the GNU Arch
29+## revision control system.
30+##
31+## arch-tag: 25f669d6-3eeb-4093-8c16-2b03df642795
32+
src/Makefile.am+7−0
@@ -18,3 +18,10 @@ libsamplerate_la_LIBADD = -lm · 17 unmodified lines
1818
1919 # Disable autoheader.
2020 AUTOHEADER=echo
21+
22+## Do not edit or modify anything in this comment block.
23+## The arch-tag line is a file identity tag for the GNU Arch
24+## revision control system.
25+##
26+## arch-tag: 62db1d8d-493b-4874-afb0-e421d3dbb868
27+
src/common.h+1−1
@@ -1,5 +1,5 @@
11 /*
2−** Copyright (C) 2002,2003 Erik de Castro Lopo <erikd@mega-nerd.com>
2+** Copyright (C) 2002-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
33 **
44 ** This program is free software; you can redistribute it and/or modify
55 ** it under the terms of the GNU General Public License as published by
tests/Makefile.am+5−0
@@ -58,3 +58,8 @@ check: $(noinst_PROGRAMS) · 57 unmodified lines
5858 @echo " ${PACKAGE}-${VERSION} passed all tests."
5959 @echo "-----------------------------------------------------------------"
6060
61+# Do not edit or modify anything in this comment block.
62+# The arch-tag line is a file identity tag for the GNU Arch
63+# revision control system.
64+#
65+# arch-tag: ec9d19f8-523c-48e5-8929-809c2641a8dc
tests/snr_bw_test.c+2−1
@@ -1,5 +1,5 @@
11 /*
2−** Copyright (C) 2002,2003 Erik de Castro Lopo <erikd@mega-nerd.com>
2+** Copyright (C) 2002-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
33 **
44 ** This program is free software; you can redistribute it and/or modify
55 ** it under the terms of the GNU General Public License as published by
@@ -428,6 +428,7 @@ main (void) · 422 unmodified lines
428428 } /* main */
429429
430430 #endif
431+
431432 /*
432433 ** Do not edit or modify anything in this comment block.
433434 ** The arch-tag line is a file identity tag for the GNU Arch
tests/src-evaluate.c+3−2
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727
2828 #include "config.h"
2929
30−#if (HAVE_LIBFFTW && HAVE_LIBRFFTW && HAVE_SNDFILE)
30+#if (HAVE_FFTW3 && HAVE_SNDFILE)
3131
3232 #include <sndfile.h>
3333 #include <math.h>
@@ -532,7 +532,8 @@ main (void) · 498 unmodified lines
532532 return 0 ;
533533 } /* main */
534534
535−#endif /* (HAVE_LIBFFTW && HAVE_LIBRFFTW && HAVE_SNDFILE) */
535+#endif /* (HAVE_FFTW3 && HAVE_SNDFILE) */
536+
536537 /*
537538 ** Do not edit or modify anything in this comment block.
538539 ** The arch-tag line is a file identity tag for the GNU Arch

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t