diff options
| author | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2004-07-09 08:31:47 +0400 |
|---|---|---|
| committer | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2004-07-09 08:31:47 +0400 |
| commit | 6019f5a99ecf0e93199ed9d1f8600f466c19eab2 (patch) | |
| tree | e87a367e4834ca3dcc9feca30fa5376600fd0225 | |
| parent | cca041ff87941633cd35af1b8b48295e1652b235 (diff) | |
Separated the version macros
git-svn-id: http://svn.xiph.org/trunk/speex@7061 0101bb08-14d6-0310-b084-bc0e0c8e3800
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | libspeex/mdf.c | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index a3844b4..f75622b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,11 +6,7 @@ EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop #Fools KDevelop into including all files -if TRUE SUBDIRS = libspeex @src@ doc win32 -else -SUBDIRS = libspeex src doc win32 -endif DIST_SUBDIRS = libspeex src doc win32 @@ -62,8 +62,8 @@ echo "Generating configuration files for $package, please wait...." echo " aclocal $ACLOCAL_FLAGS" aclocal $ACLOCAL_FLAGS -echo " autoheader" -autoheader +#echo " autoheader" +#autoheader echo " $LIBTOOLIZE --automake" $LIBTOOLIZE --automake echo " automake --add-missing $AUTOMAKE_FLAGS" diff --git a/configure.in b/configure.in index dc115cf..86a3186 100644 --- a/configure.in +++ b/configure.in @@ -4,8 +4,10 @@ AC_INIT(libspeex/speex.h) SPEEX_MAJOR_VERSION=1 SPEEX_MINOR_VERSION=1 -SPEEX_MICRO_VERSION=5 -SPEEX_VERSION=1.1.5 +SPEEX_MICRO_VERSION=6 +SPEEX_EXTRA_VERSION=-cvs +#SPEEX_VERSION=1.1.6 +SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION SPEEX_LT_CURRENT=2 SPEEX_LT_REVISION=0 @@ -64,7 +66,11 @@ AC_LIBOBJ(getopt1)])]) AC_CHECK_LIB(winmm, main) -AC_DEFINE_UNQUOTED(VERSION, "${VERSION}") +AC_DEFINE_UNQUOTED(SPEEX_VERSION, "${VERSION}") +AC_DEFINE_UNQUOTED(SPEEX_MAJOR_VERSION, ${SPEEX_MAJOR_VERSION}) +AC_DEFINE_UNQUOTED(SPEEX_MINOR_VERSION, ${SPEEX_MINOR_VERSION}) +AC_DEFINE_UNQUOTED(SPEEX_MICRO_VERSION, ${SPEEX_MICRO_VERSION}) +AC_DEFINE_UNQUOTED(SPEEX_EXTRA_VERSION, "${SPEEX_EXTRA_VERSION}") AC_ARG_ENABLE(valgrind, [ --enable-valgrind enable valgrind extra checks], [if test "$enableval" = yes; then AC_DEFINE(ENABLE_VALGRIND) fi]) diff --git a/libspeex/mdf.c b/libspeex/mdf.c index 61bf1aa..d0f1817 100644 --- a/libspeex/mdf.c +++ b/libspeex/mdf.c @@ -321,11 +321,11 @@ void speex_echo_cancel(SpeexEchoState *st, short *ref, short *echo, short *out, { if (st->cancel_count<8*M) { - st->adapt_rate = .5f/(2+M); + st->adapt_rate = .15f/(2+M); } else { st->adapt_rate = spectral_dist*(1.0f/(2+M)); - if (st->adapt_rate>.5f/(2+M)) - st->adapt_rate=.5f/(2+M); + if (st->adapt_rate>.15f/(2+M)) + st->adapt_rate=.15f/(2+M); if (st->adapt_rate<0) st->adapt_rate=0; } |