[xiph-commits] r7061 - in trunk/speex: . libspeex

[jm at dactyl.lonelymoon.com]

Author: jm
Date: Thu Jul  8 21:31:48 2004
New Revision: 7061

Modified:
trunk/speex/Makefile.am
trunk/speex/autogen.sh
trunk/speex/configure.in
trunk/speex/libspeex/mdf.c
Log:
Separated the version macros


Modified: trunk/speex/Makefile.am
===================================================================
--- trunk/speex/Makefile.am	2004-07-09 04:31:27 UTC (rev 7060)
+++ trunk/speex/Makefile.am	2004-07-09 04:31:47 UTC (rev 7061)
@@ -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


Modified: trunk/speex/autogen.sh
===================================================================
--- trunk/speex/autogen.sh	2004-07-09 04:31:27 UTC (rev 7060)
+++ trunk/speex/autogen.sh	2004-07-09 04:31:47 UTC (rev 7061)
@@ -62,8 +62,8 @@

echo "  aclocal $ACLOCAL_FLAGS"
aclocal $ACLOCAL_FLAGS
-echo "  autoheader"
-autoheader
+#echo "  autoheader"
+#autoheader
echo "  $LIBTOOLIZE --automake"
$LIBTOOLIZE --automake
echo "  automake --add-missing $AUTOMAKE_FLAGS"

Modified: trunk/speex/configure.in
===================================================================
--- trunk/speex/configure.in	2004-07-09 04:31:27 UTC (rev 7060)
+++ trunk/speex/configure.in	2004-07-09 04:31:47 UTC (rev 7061)
@@ -4,8 +4,10 @@

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_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])


Modified: trunk/speex/libspeex/mdf.c
===================================================================
--- trunk/speex/libspeex/mdf.c	2004-07-09 04:31:27 UTC (rev 7060)
+++ trunk/speex/libspeex/mdf.c	2004-07-09 04:31:47 UTC (rev 7061)
@@ -321,11 +321,11 @@
{
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;
}