Hello community,
here is the log from the commit of package alsa
checked in at Tue Jun 5 00:43:19 CEST 2007.
--------
--- alsa/alsa.changes 2007-05-24 12:56:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2007-05-31 12:24:03.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 31 12:23:49 CEST 2007 - tiwai@suse.de
+
+- updated to version 1.0.14-final
+ * including the previous HG fixes
+
+-------------------------------------------------------------------
Old:
----
alsa-lib-1.0.14rc4.tar.bz2
alsa-lib-hg-fixes.diff
New:
----
alsa-lib-1.0.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.q17152/_old 2007-06-05 00:42:41.000000000 +0200
+++ /var/tmp/diff_new_pack.q17152/_new 2007-06-05 00:42:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package alsa (Version 1.0.13)
+# spec file for package alsa (Version 1.0.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: alsa
BuildRequires: doxygen
-%define package_version 1.0.14rc4
+%define package_version 1.0.14
License: GNU General Public License (GPL)
Group: System/Libraries
Requires: libasound2 alsa-utils
@@ -20,8 +20,8 @@
PreReq: %insserv_prereq %fillup_prereq
Autoreqprov: on
Summary: Advanced Linux Sound Architecture
-Version: 1.0.13
-Release: 51
+Version: 1.0.14
+Release: 1
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source8: 40-alsa.rules
Source11: alsasound
@@ -35,7 +35,7 @@
Source30: all_notes_off
Source31: all_notes_off.bin
Source32: all_notes_off.mid
-Patch: alsa-lib-hg-fixes.diff
+# Patch: alsa-lib-hg-fixes.diff
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -113,7 +113,7 @@
%prep
%setup -n alsa-lib-%{package_version}
-%patch -p1
+# %patch -p1
%{?suse_update_config:%{suse_update_config -f .}}
%build
@@ -261,6 +261,9 @@
%{_datadir}/alsa
%changelog
+* Thu May 31 2007 - tiwai@suse.de
+- updated to version 1.0.14-final
+ * including the previous HG fixes
* Thu May 24 2007 - tiwai@suse.de
- HG patch as of 2007.05.24:
* configure options to specify config and plugin paths
++++++ alsa-lib-1.0.14rc4.tar.bz2 -> alsa-lib-1.0.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/alsalisp/Makefile.in new/alsa-lib-1.0.14/alsalisp/Makefile.in
--- old/alsa-lib-1.0.14rc4/alsalisp/Makefile.in 2007-05-02 10:02:54.000000000 +0200
+++ new/alsa-lib-1.0.14/alsalisp/Makefile.in 2007-05-31 10:05:20.000000000 +0200
@@ -69,9 +69,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/aserver/Makefile.in new/alsa-lib-1.0.14/aserver/Makefile.in
--- old/alsa-lib-1.0.14rc4/aserver/Makefile.in 2007-05-02 10:02:54.000000000 +0200
+++ new/alsa-lib-1.0.14/aserver/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -71,9 +71,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/configure new/alsa-lib-1.0.14/configure
--- old/alsa-lib-1.0.14rc4/configure 2007-05-02 10:02:59.000000000 +0200
+++ new/alsa-lib-1.0.14/configure 2007-05-31 10:05:25.000000000 +0200
@@ -867,6 +867,8 @@
SND_LIB_SUBMINOR
SND_LIB_EXTRAVER
LIBTOOL_VERSION_INFO
+ALSA_CONFIG_DIR
+ALSA_PLUGIN_DIR
VERSIONED_SYMBOLS_TRUE
VERSIONED_SYMBOLS_FALSE
SYMBOLIC_FUNCTIONS_TRUE
@@ -1571,6 +1573,8 @@
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
+ --with-configdir=dir path where ALSA config files are stored
+ --with-plugindir=dir path where ALSA plugin files are stored
--with-versioned shared library will be compiled with versioned
symbols (default = yes)
--with-debug library will be compiled with asserts (default =
@@ -2466,7 +2470,7 @@
# Define the identity of the package.
PACKAGE=alsa-lib
- VERSION=1.0.14rc4
+ VERSION=1.0.14
cat >>confdefs.h <<_ACEOF
@@ -4871,7 +4875,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4874 "configure"' > conftest.$ac_ext
+ echo '#line 4878 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7572,11 +7576,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7575: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7579: \$? = $ac_status" >&5
+ echo "$as_me:7583: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7840,11 +7844,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7843: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7847: \$? = $ac_status" >&5
+ echo "$as_me:7851: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7944,11 +7948,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7947: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7951: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7951: \$? = $ac_status" >&5
+ echo "$as_me:7955: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10396,7 +10400,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:12871: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12871: \$? = $ac_status" >&5
+ echo "$as_me:12875: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12968,11 +12972,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12971: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12975: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12975: \$? = $ac_status" >&5
+ echo "$as_me:12979: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14538,11 +14542,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14541: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14545: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14545: \$? = $ac_status" >&5
+ echo "$as_me:14549: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14642,11 +14646,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14645: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14649: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14649: \$? = $ac_status" >&5
+ echo "$as_me:14653: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16872,11 +16876,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16875: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16879: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16879: \$? = $ac_status" >&5
+ echo "$as_me:16883: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17140,11 +17144,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17143: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17147: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17147: \$? = $ac_status" >&5
+ echo "$as_me:17151: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17244,11 +17248,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17247: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17251: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17251: \$? = $ac_status" >&5
+ echo "$as_me:17255: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20618,29 +20622,55 @@
test "x$prefix" = xNONE && prefix=$ac_default_prefix
-eval dir="$datadir"
-case "$dir" in
-/*) ;;
-*) dir="$prefix/share"
-esac
+
+# Check whether --with-configdir was given.
+if test "${with_configdir+set}" = set; then
+ withval=$with_configdir; confdir="$withval"
+else
+ confdir=""
+fi
+
+if test -z "$confdir"; then
+ eval dir="$datadir"
+ case "$dir" in
+ /*) ;;
+ *) dir="$prefix/share"
+ esac
+ confdir="$dir/alsa"
+fi
+ALSA_CONFIG_DIR="$confdir"
cat >>confdefs.h <<_ACEOF
-#define DATADIR "$dir"
+#define ALSA_CONFIG_DIR "$confdir"
_ACEOF
+
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-eval dir="$libdir"
-case "$dir" in
-/*) ;;
-*) dir="$dir"
-esac
+
+# Check whether --with-plugindir was given.
+if test "${with_plugindir+set}" = set; then
+ withval=$with_plugindir; plugindir="$withval"
+else
+ plugindir=""
+fi
+
+if test -z "$plugindir"; then
+ eval dir="$libdir"
+ case "$dir" in
+ /*) ;;
+ *) dir="$dir"
+ esac
+ plugindir="$dir/$PACKAGE"
+fi
cat >>confdefs.h <<_ACEOF
-#define PKGLIBDIR "$dir/$PACKAGE"
+#define ALSA_PLUGIN_DIR "plugindir"
_ACEOF
+ALSA_PLUGIN_DIR="$plugindir"
+
{ echo "$as_me:$LINENO: checking for versioned symbols" >&5
echo $ECHO_N "checking for versioned symbols... $ECHO_C" >&6; }
@@ -23133,6 +23163,8 @@
SND_LIB_SUBMINOR!$SND_LIB_SUBMINOR$ac_delim
SND_LIB_EXTRAVER!$SND_LIB_EXTRAVER$ac_delim
LIBTOOL_VERSION_INFO!$LIBTOOL_VERSION_INFO$ac_delim
+ALSA_CONFIG_DIR!$ALSA_CONFIG_DIR$ac_delim
+ALSA_PLUGIN_DIR!$ALSA_PLUGIN_DIR$ac_delim
VERSIONED_SYMBOLS_TRUE!$VERSIONED_SYMBOLS_TRUE$ac_delim
VERSIONED_SYMBOLS_FALSE!$VERSIONED_SYMBOLS_FALSE$ac_delim
SYMBOLIC_FUNCTIONS_TRUE!$SYMBOLIC_FUNCTIONS_TRUE$ac_delim
@@ -23211,8 +23243,6 @@
BUILD_PCM_PLUGIN_IOPLUG_FALSE!$BUILD_PCM_PLUGIN_IOPLUG_FALSE$ac_delim
BUILD_CTL_PLUGIN_TRUE!$BUILD_CTL_PLUGIN_TRUE$ac_delim
BUILD_CTL_PLUGIN_FALSE!$BUILD_CTL_PLUGIN_FALSE$ac_delim
-BUILD_CTL_PLUGIN_SHM_TRUE!$BUILD_CTL_PLUGIN_SHM_TRUE$ac_delim
-BUILD_CTL_PLUGIN_SHM_FALSE!$BUILD_CTL_PLUGIN_SHM_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23254,13 +23284,15 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+BUILD_CTL_PLUGIN_SHM_TRUE!$BUILD_CTL_PLUGIN_SHM_TRUE$ac_delim
+BUILD_CTL_PLUGIN_SHM_FALSE!$BUILD_CTL_PLUGIN_SHM_FALSE$ac_delim
BUILD_CTL_PLUGIN_EXT_TRUE!$BUILD_CTL_PLUGIN_EXT_TRUE$ac_delim
BUILD_CTL_PLUGIN_EXT_FALSE!$BUILD_CTL_PLUGIN_EXT_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/configure.in new/alsa-lib-1.0.14/configure.in
--- old/alsa-lib-1.0.14rc4/configure.in 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/configure.in 2007-05-31 10:05:13.000000000 +0200
@@ -9,7 +9,7 @@
dnl remove API = c+1:0:0
dnl *************************************************
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.14rc4)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.14)
eval LIBTOOL_VERSION_INFO="2:0:0"
dnl *************************************************
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")
@@ -61,21 +61,41 @@
test "x$prefix" = xNONE && prefix=$ac_default_prefix
-eval dir="$datadir"
-case "$dir" in
-/*) ;;
-*) dir="$prefix/share"
-esac
-AC_DEFINE_UNQUOTED(DATADIR, "$dir", [directory containing ALSA configuration database])
+dnl ALSA configuration directory
+AC_ARG_WITH(configdir,
+ AS_HELP_STRING([--with-configdir=dir],
+ [path where ALSA config files are stored]),
+ confdir="$withval", confdir="")
+if test -z "$confdir"; then
+ eval dir="$datadir"
+ case "$dir" in
+ /*) ;;
+ *) dir="$prefix/share"
+ esac
+ confdir="$dir/alsa"
+fi
+ALSA_CONFIG_DIR="$confdir"
+AC_DEFINE_UNQUOTED(ALSA_CONFIG_DIR, "$confdir", [directory containing ALSA configuration database])
+AC_SUBST(ALSA_CONFIG_DIR)
+dnl ALSA plugin directory
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-eval dir="$libdir"
-case "$dir" in
-/*) ;;
-*) dir="$dir"
-esac
-AC_DEFINE_UNQUOTED(PKGLIBDIR, "$dir/$PACKAGE", [directory containing ALSA add-on modules])
+AC_ARG_WITH(plugindir,
+ AS_HELP_STRING([--with-plugindir=dir],
+ [path where ALSA plugin files are stored]),
+ plugindir="$withval", plugindir="")
+if test -z "$plugindir"; then
+ eval dir="$libdir"
+ case "$dir" in
+ /*) ;;
+ *) dir="$dir"
+ esac
+ plugindir="$dir/$PACKAGE"
+fi
+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
+ALSA_PLUGIN_DIR="$plugindir"
+AC_SUBST(ALSA_PLUGIN_DIR)
dnl Check for versioned symbols
AC_MSG_CHECKING(for versioned symbols)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/doc/Makefile.in new/alsa-lib-1.0.14/doc/Makefile.in
--- old/alsa-lib-1.0.14rc4/doc/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/doc/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -59,9 +59,11 @@
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/doc/pictures/Makefile.in new/alsa-lib-1.0.14/doc/pictures/Makefile.in
--- old/alsa-lib-1.0.14rc4/doc/pictures/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/doc/pictures/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -50,9 +50,11 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/include/config.h.in new/alsa-lib-1.0.14/include/config.h.in
--- old/alsa-lib-1.0.14rc4/include/config.h.in 2007-05-02 10:02:52.000000000 +0200
+++ new/alsa-lib-1.0.14/include/config.h.in 2007-05-31 10:05:18.000000000 +0200
@@ -3,9 +3,15 @@
/* Directory with aload* device files */
#undef ALOAD_DEVICE_DIRECTORY
+/* directory containing ALSA configuration database */
+#undef ALSA_CONFIG_DIR
+
/* Directory with ALSA device files */
#undef ALSA_DEVICE_DIRECTORY
+/* directory containing ALSA add-on modules */
+#undef ALSA_PLUGIN_DIR
+
/* Build instrument component */
#undef BUILD_INSTR
@@ -39,9 +45,6 @@
/* Build sequencer component */
#undef BUILD_SEQ
-/* directory containing ALSA configuration database */
-#undef DATADIR
-
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
@@ -108,9 +111,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* directory containing ALSA add-on modules */
-#undef PKGLIBDIR
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/include/Makefile.in new/alsa-lib-1.0.14/include/Makefile.in
--- old/alsa-lib-1.0.14rc4/include/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/include/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -71,9 +71,11 @@
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/include/sound/Makefile.in new/alsa-lib-1.0.14/include/sound/Makefile.in
--- old/alsa-lib-1.0.14rc4/include/sound/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/include/sound/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -63,9 +63,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/include/version.h new/alsa-lib-1.0.14/include/version.h
--- old/alsa-lib-1.0.14rc4/include/version.h 2007-05-02 10:03:13.000000000 +0200
+++ new/alsa-lib-1.0.14/include/version.h 2007-05-31 10:05:39.000000000 +0200
@@ -5,11 +5,11 @@
#define SND_LIB_MAJOR 1 /**< major number of library version */
#define SND_LIB_MINOR 0 /**< minor number of library version */
#define SND_LIB_SUBMINOR 14 /**< subminor number of library version */
-#define SND_LIB_EXTRAVER 100004 /**< extra version number, used mainly for betas */
+#define SND_LIB_EXTRAVER 1000000 /**< extra version number, used mainly for betas */
/** library version */
#define SND_LIB_VERSION ((SND_LIB_MAJOR<<16)|\
(SND_LIB_MINOR<<8)|\
SND_LIB_SUBMINOR)
/** library version (string) */
-#define SND_LIB_VERSION_STR "1.0.14rc4"
+#define SND_LIB_VERSION_STR "1.0.14"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/libtool new/alsa-lib-1.0.14/libtool
--- old/alsa-lib-1.0.14rc4/libtool 2007-05-02 10:03:08.000000000 +0200
+++ new/alsa-lib-1.0.14/libtool 2007-05-31 10:05:34.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# libtoolT - Provide generalized library-building support services.
-# Generated automatically by (GNU alsa-lib 1.0.14rc4)
+# Generated automatically by (GNU alsa-lib 1.0.14)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/Makefile.in new/alsa-lib-1.0.14/Makefile.in
--- old/alsa-lib-1.0.14rc4/Makefile.in 2007-05-02 10:02:58.000000000 +0200
+++ new/alsa-lib-1.0.14/Makefile.in 2007-05-31 10:05:24.000000000 +0200
@@ -77,9 +77,11 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/modules/Makefile.in new/alsa-lib-1.0.14/modules/Makefile.in
--- old/alsa-lib-1.0.14rc4/modules/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/modules/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -59,9 +59,11 @@
DIST_SUBDIRS = mixer
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/modules/mixer/Makefile.in new/alsa-lib-1.0.14/modules/mixer/Makefile.in
--- old/alsa-lib-1.0.14rc4/modules/mixer/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/modules/mixer/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -59,9 +59,11 @@
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/modules/mixer/simple/Makefile.am new/alsa-lib-1.0.14/modules/mixer/simple/Makefile.am
--- old/alsa-lib-1.0.14rc4/modules/mixer/simple/Makefile.am 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/modules/mixer/simple/Makefile.am 2007-05-31 10:05:13.000000000 +0200
@@ -1,4 +1,4 @@
-pkglibdir = $(libdir)/@PACKAGE@/smixer
+pkglibdir = @ALSA_PLUGIN_DIR@/smixer
AM_CFLAGS = -g -O2 -W -Wall
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/modules/mixer/simple/Makefile.in new/alsa-lib-1.0.14/modules/mixer/simple/Makefile.in
--- old/alsa-lib-1.0.14rc4/modules/mixer/simple/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/modules/mixer/simple/Makefile.in 2007-05-31 10:05:21.000000000 +0200
@@ -85,11 +85,13 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkglibdir = $(libdir)/@PACKAGE@/smixer
+pkglibdir = @ALSA_PLUGIN_DIR@/smixer
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/modules/mixer/simple/sbasedl.c new/alsa-lib-1.0.14/modules/mixer/simple/sbasedl.c
--- old/alsa-lib-1.0.14rc4/modules/mixer/simple/sbasedl.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/modules/mixer/simple/sbasedl.c 2007-05-31 10:05:13.000000000 +0200
@@ -33,7 +33,7 @@
#include "mixer_abst.h"
#include "sbase.h"
-#define SO_PATH PKGLIBDIR "/smixer"
+#define SO_PATH ALSA_PLUGIN_DIR "/smixer"
int mixer_simple_basic_dlopen(snd_mixer_class_t *class,
bclass_base_ops_t **ops)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/alisp/alisp.c new/alsa-lib-1.0.14/src/alisp/alisp.c
--- old/alsa-lib-1.0.14rc4/src/alisp/alisp.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/alisp/alisp.c 2007-05-31 10:05:14.000000000 +0200
@@ -2395,7 +2395,7 @@
}
if (!strcmp(p1->value.s, "data")) {
delete_tree(instance, p1);
- return new_string(instance, DATADIR);
+ return new_string(instance, ALSA_CONFIG_DIR);
}
delete_tree(instance, p1);
return &alsa_lisp_nil;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/alisp/Makefile.in new/alsa-lib-1.0.14/src/alisp/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/alisp/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/alisp/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -69,9 +69,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/compat/Makefile.in new/alsa-lib-1.0.14/src/compat/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/compat/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/compat/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -71,9 +71,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/cards/HDA-Intel.conf new/alsa-lib-1.0.14/src/conf/cards/HDA-Intel.conf
--- old/alsa-lib-1.0.14rc4/src/conf/cards/HDA-Intel.conf 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/cards/HDA-Intel.conf 2007-05-31 10:05:14.000000000 +0200
@@ -44,8 +44,18 @@
capture.pcm {
type plug
slave.pcm {
- @func concat
- strings [ "dsnoop:" $CARD ]
+ type softvol
+ slave.pcm {
+ @func concat
+ strings [ "dsnoop:" $CARD ]
+ }
+ control {
+ name "Digital Capture Volume"
+ card $CARD
+ }
+ min_dB -30.0
+ max_dB 30.0
+ resolution 121
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/cards/Maestro3.conf new/alsa-lib-1.0.14/src/conf/cards/Maestro3.conf
--- old/alsa-lib-1.0.14rc4/src/conf/cards/Maestro3.conf 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/cards/Maestro3.conf 2007-05-31 10:05:14.000000000 +0200
@@ -21,8 +21,10 @@
playback.pcm {
type plug
slave.pcm {
+ # we need to specify device and subdevice numbers
+ # for a device with multiple substreams
@func concat
- strings [ "dmix:" $CARD ]
+ strings [ "dmix:" $CARD ",0,0" ]
}
}
capture.pcm {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/cards/Makefile.am new/alsa-lib-1.0.14/src/conf/cards/Makefile.am
--- old/alsa-lib-1.0.14rc4/src/conf/cards/Makefile.am 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/cards/Makefile.am 2007-05-31 10:05:14.000000000 +0200
@@ -1,4 +1,4 @@
-alsadir = $(datadir)/alsa/cards
+alsadir = @ALSA_CONFIG_DIR@/cards
cfg_files = aliases.conf \
AACI.conf \
ATIIXP.conf \
@@ -56,7 +56,7 @@
alsa_DATA = $(cfg_files)
if BUILD_ALISP
-SI7018dir = $(datadir)/alsa/cards/SI7018
+SI7018dir = @ALSA_CONFIG_DIR@/cards/SI7018
SI7018_files = \
SI7018/sndoc-mixer.alisp \
SI7018/sndop-mixer.alisp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/cards/Makefile.in new/alsa-lib-1.0.14/src/conf/cards/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/conf/cards/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/cards/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -62,9 +62,11 @@
DATA = $(SI7018_DATA) $(alsa_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -258,7 +260,7 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-alsadir = $(datadir)/alsa/cards
+alsadir = @ALSA_CONFIG_DIR@/cards
cfg_files = aliases.conf AACI.conf ATIIXP.conf ATIIXP-SPDMA.conf \
ATIIXP-MODEM.conf AU8810.conf AU8820.conf AU8830.conf \
Audigy.conf Audigy2.conf Aureon51.conf Aureon71.conf \
@@ -272,7 +274,7 @@
VIA686A.conf VIA8233.conf VIA8233A.conf VIA8237.conf \
VX222.conf VXPocket.conf VXPocket440.conf $(am__append_1)
alsa_DATA = $(cfg_files)
-@BUILD_ALISP_TRUE@SI7018dir = $(datadir)/alsa/cards/SI7018
+@BUILD_ALISP_TRUE@SI7018dir = @ALSA_CONFIG_DIR@/cards/SI7018
@BUILD_ALISP_FALSE@SI7018_files =
@BUILD_ALISP_TRUE@SI7018_files = \
@BUILD_ALISP_TRUE@ SI7018/sndoc-mixer.alisp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/Makefile.am new/alsa-lib-1.0.14/src/conf/Makefile.am
--- old/alsa-lib-1.0.14rc4/src/conf/Makefile.am 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/Makefile.am 2007-05-31 10:05:14.000000000 +0200
@@ -10,5 +10,5 @@
EXTRA_DIST = $(cfg_files)
-alsadir = $(datadir)/alsa
+alsadir = @ALSA_CONFIG_DIR@
alsa_DATA = $(cfg_files)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/Makefile.in new/alsa-lib-1.0.14/src/conf/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/conf/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -71,9 +71,11 @@
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -270,7 +272,7 @@
SUBDIRS = cards pcm
cfg_files = alsa.conf $(am__append_1) $(am__append_2)
EXTRA_DIST = $(cfg_files)
-alsadir = $(datadir)/alsa
+alsadir = @ALSA_CONFIG_DIR@
alsa_DATA = $(cfg_files)
all: all-recursive
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/pcm/Makefile.am new/alsa-lib-1.0.14/src/conf/pcm/Makefile.am
--- old/alsa-lib-1.0.14rc4/src/conf/pcm/Makefile.am 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/pcm/Makefile.am 2007-05-31 10:05:14.000000000 +0200
@@ -7,5 +7,5 @@
EXTRA_DIST = $(cfg_files)
-alsadir = $(datadir)/alsa/pcm
+alsadir = @ALSA_CONFIG_DIR@/pcm
alsa_DATA = $(cfg_files)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf/pcm/Makefile.in new/alsa-lib-1.0.14/src/conf/pcm/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/conf/pcm/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf/pcm/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -60,9 +60,11 @@
DATA = $(alsa_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -264,7 +266,7 @@
dpl.conf
EXTRA_DIST = $(cfg_files)
-alsadir = $(datadir)/alsa/pcm
+alsadir = @ALSA_CONFIG_DIR@/pcm
alsa_DATA = $(cfg_files)
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/conf.c new/alsa-lib-1.0.14/src/conf.c
--- old/alsa-lib-1.0.14rc4/src/conf.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/conf.c 2007-05-31 10:05:14.000000000 +0200
@@ -580,12 +580,12 @@
if (err < 0)
return err;
if (!strncmp(str, "confdir:", 8)) {
- char *tmp = malloc(strlen(DATADIR "/alsa") + 1 + strlen(str + 8) + 1);
+ char *tmp = malloc(strlen(ALSA_CONFIG_DIR) + 1 + strlen(str + 8) + 1);
if (tmp == NULL) {
free(str);
return -ENOMEM;
}
- sprintf(tmp, DATADIR "/alsa/%s", str + 8);
+ sprintf(tmp, ALSA_CONFIG_DIR "/%s", str + 8);
free(str);
str = tmp;
}
@@ -2606,7 +2606,7 @@
#define ALSA_CONFIG_PATH_VAR "ALSA_CONFIG_PATH"
/** The name of the default files used by #snd_config_update. */
-#define ALSA_CONFIG_PATH_DEFAULT DATADIR "/alsa/alsa.conf"
+#define ALSA_CONFIG_PATH_DEFAULT ALSA_CONFIG_DIR "/alsa.conf"
/**
* \ingroup Config
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/confmisc.c new/alsa-lib-1.0.14/src/confmisc.c
--- old/alsa-lib-1.0.14rc4/src/confmisc.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/confmisc.c 2007-05-31 10:05:14.000000000 +0200
@@ -588,7 +588,7 @@
err = snd_config_get_id(src, &id);
if (err < 0)
return err;
- return snd_config_imake_string(dst, id, DATADIR "/alsa");
+ return snd_config_imake_string(dst, id, ALSA_CONFIG_DIR);
}
#ifndef DOC_HIDDEN
SND_DLSYM_BUILD_VERSION(snd_func_datadir, SND_CONFIG_DLSYM_VERSION_EVALUATE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/control/control.c new/alsa-lib-1.0.14/src/control/control.c
--- old/alsa-lib-1.0.14rc4/src/control/control.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/control/control.c 2007-05-31 10:05:14.000000000 +0200
@@ -849,13 +849,13 @@
build_in++;
}
if (*build_in == NULL) {
- buf1 = malloc(strlen(str) + sizeof(PKGLIBDIR) + 32);
+ buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 32);
if (buf1 == NULL) {
err = -ENOMEM;
goto _err;
}
lib = buf1;
- sprintf(buf1, "%s/libasound_module_ctl_%s.so", PKGLIBDIR, str);
+ sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str);
}
}
#ifndef PIC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/control/Makefile.in new/alsa-lib-1.0.14/src/control/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/control/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/control/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -78,9 +78,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/hwdep/Makefile.in new/alsa-lib-1.0.14/src/hwdep/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/hwdep/Makefile.in 2007-05-02 10:02:56.000000000 +0200
+++ new/alsa-lib-1.0.14/src/hwdep/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -69,9 +69,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/instr/Makefile.in new/alsa-lib-1.0.14/src/instr/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/instr/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/instr/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -66,9 +66,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/Makefile.in new/alsa-lib-1.0.14/src/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/Makefile.in 2007-05-02 10:02:55.000000000 +0200
+++ new/alsa-lib-1.0.14/src/Makefile.in 2007-05-31 10:05:22.000000000 +0200
@@ -112,9 +112,11 @@
compat conf
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/mixer/Makefile.in new/alsa-lib-1.0.14/src/mixer/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/mixer/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/mixer/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -70,9 +70,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/mixer/simple_abst.c new/alsa-lib-1.0.14/src/mixer/simple_abst.c
--- old/alsa-lib-1.0.14rc4/src/mixer/simple_abst.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/mixer/simple_abst.c 2007-05-31 10:05:14.000000000 +0200
@@ -41,7 +41,7 @@
#ifndef DOC_HIDDEN
-#define SO_PATH PKGLIBDIR "/smixer"
+#define SO_PATH ALSA_PLUGIN_DIR "/smixer"
typedef struct _class_priv {
char *device;
@@ -239,7 +239,7 @@
goto __error;
file = getenv("ALSA_MIXER_SIMPLE");
if (!file)
- file = DATADIR "/alsa/smixer.conf";
+ file = ALSA_CONFIG_DIR "/smixer.conf";
err = snd_config_top(&top);
if (err >= 0) {
err = snd_input_stdio_open(&input, file, "r");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/pcm/Makefile.in new/alsa-lib-1.0.14/src/pcm/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/pcm/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/pcm/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -157,9 +157,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/pcm/pcm.c new/alsa-lib-1.0.14/src/pcm/pcm.c
--- old/alsa-lib-1.0.14rc4/src/pcm/pcm.c 2007-05-02 10:02:47.000000000 +0200
+++ new/alsa-lib-1.0.14/src/pcm/pcm.c 2007-05-31 10:05:14.000000000 +0200
@@ -2080,13 +2080,13 @@
build_in++;
}
if (*build_in == NULL) {
- buf1 = malloc(strlen(str) + sizeof(PKGLIBDIR) + 32);
+ buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 32);
if (buf1 == NULL) {
err = -ENOMEM;
goto _err;
}
lib = buf1;
- sprintf(buf1, "%s/libasound_module_pcm_%s.so", PKGLIBDIR, str);
+ sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
}
}
#ifndef PIC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/pcm/pcm_direct.c new/alsa-lib-1.0.14/src/pcm/pcm_direct.c
--- old/alsa-lib-1.0.14rc4/src/pcm/pcm_direct.c 2007-05-02 10:02:48.000000000 +0200
+++ new/alsa-lib-1.0.14/src/pcm/pcm_direct.c 2007-05-31 10:05:14.000000000 +0200
@@ -1528,7 +1528,7 @@
rec->ipc_key = 0;
rec->ipc_perm = 0600;
rec->ipc_gid = -1;
- rec->slowptr = 0;
+ rec->slowptr = 1;
rec->max_periods = 0;
/* read defaults */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/pcm/pcm_rate.c new/alsa-lib-1.0.14/src/pcm/pcm_rate.c
--- old/alsa-lib-1.0.14rc4/src/pcm/pcm_rate.c 2007-05-02 10:02:48.000000000 +0200
+++ new/alsa-lib-1.0.14/src/pcm/pcm_rate.c 2007-05-31 10:05:14.000000000 +0200
@@ -1284,7 +1284,7 @@
char lib_name[128], *lib = NULL;
if (!is_builtin_plugin(type)) {
snprintf(lib_name, sizeof(lib_name),
- "%s/libasound_module_rate_%s.so", PKGLIBDIR, type);
+ "%s/libasound_module_rate_%s.so", ALSA_PLUGIN_DIR, type);
lib = lib_name;
}
h = snd_dlopen(lib, RTLD_NOW);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/pcm/pcm_softvol.c new/alsa-lib-1.0.14/src/pcm/pcm_softvol.c
--- old/alsa-lib-1.0.14rc4/src/pcm/pcm_softvol.c 2007-05-02 10:02:48.000000000 +0200
+++ new/alsa-lib-1.0.14/src/pcm/pcm_softvol.c 2007-05-31 10:05:14.000000000 +0200
@@ -25,7 +25,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-
+
#include
#include
#include "pcm_local.h"
@@ -46,17 +46,22 @@
snd_ctl_t *ctl;
snd_ctl_elem_value_t elem;
unsigned int cur_vol[2];
- unsigned int max_val;
+ unsigned int max_val; /* max index */
+ unsigned int zero_dB_val; /* index at 0 dB */
double min_dB;
- unsigned short *dB_value;
+ double max_dB;
+ unsigned int *dB_value;
} snd_pcm_softvol_t;
#define VOL_SCALE_SHIFT 16
+#define VOL_SCALE_MASK ((1 << VOL_SCALE_SHIFT) - 1)
#define PRESET_RESOLUTION 256
#define PRESET_MIN_DB -51.0
+#define ZERO_DB 0.0
+#define MAX_DB_UPPER_LIMIT 50
-static unsigned short preset_dB_value[PRESET_RESOLUTION] = {
+static unsigned int preset_dB_value[PRESET_RESOLUTION] = {
0x00b8, 0x00bd, 0x00c1, 0x00c5, 0x00ca, 0x00cf, 0x00d4, 0x00d9,
0x00de, 0x00e3, 0x00e8, 0x00ed, 0x00f3, 0x00f9, 0x00fe, 0x0104,
0x010a, 0x0111, 0x0117, 0x011e, 0x0124, 0x012b, 0x0132, 0x0139,
@@ -96,10 +101,10 @@
int i;
short s[2];
} val_t;
-static inline int MULTI_DIV_int(int a, unsigned short b, int swap)
+static inline int MULTI_DIV_32x16(int a, unsigned short b, int swap)
{
val_t v, x, y;
- v.i = swap ? (int)bswap_32(a) : a;
+ v.i = a;
y.i = 0;
#if __BYTE_ORDER == __LITTLE_ENDIAN
x.i = (unsigned int)v.s[0] * b;
@@ -110,14 +115,40 @@
y.s[1] = x.s[0];
y.i += (int)v.s[0] * b;
#endif
- return swap ? (int)bswap_32(y.i) : y.i;
+ return y.i;
}
-/* (16bit x 16bit) >> 16 */
-#define MULTI_DIV_short(src, scale, swap) \
-(swap \
- ? bswap_16(((short) bswap_16(src) * (scale)) >> VOL_SCALE_SHIFT) \
- : (((int) (src) * (scale)) >> VOL_SCALE_SHIFT))
+static inline int MULTI_DIV_int(int a, unsigned int b, int swap)
+{
+ unsigned int gain = (b >> VOL_SCALE_SHIFT);
+ int fraction;
+ a = swap ? (int)bswap_32(a) : a;
+ fraction = MULTI_DIV_32x16(a, b & VOL_SCALE_MASK, swap);
+ if (gain) {
+ long long amp = (long long)a * gain + fraction;
+ if (amp > (int)0x7fffffff)
+ amp = (int)0x7fffffff;
+ else if (amp < (int)0x80000000)
+ amp = (int)0x80000000;
+ return swap ? (int)bswap_32((int)amp) : (int)amp;
+ }
+ return swap ? (int)bswap_32(fraction) : fraction;
+}
+
+static inline short MULTI_DIV_short(short a, unsigned int b, int swap)
+{
+ unsigned int gain = b >> VOL_SCALE_SHIFT;
+ int fraction;
+ a = swap ? (short)bswap_16(a) : a;
+ fraction = (int)(a * (b & VOL_SCALE_MASK)) >> VOL_SCALE_SHIFT;
+ if (gain) {
+ int amp = a * gain + fraction;
+ if (abs(amp) > 0x7fff)
+ amp = (a<0) ? (short)0x8000 : (short)0x7fff;
+ return swap ? (short)bswap_16((short)amp) : (short)amp;
+ }
+ return swap ? (short)bswap_16((short)fraction) : (short)fraction;
+}
#endif /* DOC_HIDDEN */
@@ -237,8 +268,8 @@
snd_pcm_areas_silence(dst_areas, dst_offset, channels, frames,
svol->sformat);
return;
- } else if (svol->cur_vol[0] == svol->max_val &&
- svol->cur_vol[1] == svol->max_val) {
+ } else if (svol->zero_dB_val && svol->cur_vol[0] == svol->zero_dB_val &&
+ svol->cur_vol[1] == svol->zero_dB_val) {
snd_pcm_areas_copy(dst_areas, dst_offset, src_areas, src_offset,
channels, frames, svol->sformat);
return;
@@ -288,7 +319,7 @@
snd_pcm_areas_silence(dst_areas, dst_offset, channels, frames,
svol->sformat);
return;
- } else if (svol->cur_vol[0] == svol->max_val) {
+ } else if (svol->zero_dB_val && svol->cur_vol[0] == svol->zero_dB_val) {
snd_pcm_areas_copy(dst_areas, dst_offset, src_areas, src_offset,
channels, frames, svol->sformat);
return;
@@ -539,6 +570,7 @@
snd_output_printf(out, "Soft volume PCM\n");
snd_output_printf(out, "Control: %s\n", svol->elem.id.name);
snd_output_printf(out, "min_dB: %g\n", svol->min_dB);
+ snd_output_printf(out, "max_dB: %g\n", svol->max_dB);
snd_output_printf(out, "resolution: %d\n", svol->max_val + 1);
if (pcm->setup) {
snd_output_printf(out, "Its setup is:\n");
@@ -554,7 +586,7 @@
tlv[0] = SND_CTL_TLVT_DB_SCALE;
tlv[1] = 2 * sizeof(int);
tlv[2] = svol->min_dB * 100;
- tlv[3] = -svol->min_dB * 100 / svol->max_val;
+ tlv[3] = (svol->max_dB - svol->min_dB) * 100 / svol->max_val;
return snd_ctl_elem_tlv_write(svol->ctl, &cinfo->id, tlv);
}
@@ -562,14 +594,17 @@
{
int err;
int i;
-
+ unsigned int def_val;
+
err = snd_ctl_elem_add_integer(svol->ctl, &cinfo->id, count, 0, svol->max_val, 0);
if (err < 0)
return err;
add_tlv_info(svol, cinfo);
- /* set max value as default */
+ /* set zero dB value as default, or max_val if
+ there is no 0 dB setting */
+ def_val = svol->zero_dB_val ? svol->zero_dB_val : svol->max_val;
for (i = 0; i < count; i++)
- svol->elem.value.integer.value[i] = svol->max_val;
+ svol->elem.value.integer.value[i] = def_val;
return snd_ctl_elem_write(svol->ctl, &svol->elem);
}
@@ -581,7 +616,8 @@
*/
static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
int ctl_card, snd_ctl_elem_id_t *ctl_id,
- int cchannels, double min_dB, int resolution)
+ int cchannels, double min_dB, double max_dB,
+ int resolution)
{
char tmp_name[32];
snd_pcm_info_t *info;
@@ -610,7 +646,14 @@
svol->elem.id = *ctl_id;
svol->max_val = resolution - 1;
svol->min_dB = min_dB;
-
+ svol->max_dB = max_dB;
+ if (svol->max_dB == ZERO_DB)
+ svol->zero_dB_val = svol->max_val;
+ else if (svol->max_dB < 0)
+ svol->zero_dB_val = 0; /* there is no 0 dB setting */
+ else
+ svol->zero_dB_val = (min_dB / (min_dB - max_dB)) * svol->max_val;
+
snd_ctl_elem_info_alloca(&cinfo);
snd_ctl_elem_info_set_id(cinfo, ctl_id);
if ((err = snd_ctl_elem_info(svol->ctl, cinfo)) < 0) {
@@ -650,24 +693,26 @@
}
}
- if (min_dB == PRESET_MIN_DB && resolution == PRESET_RESOLUTION)
+ if (min_dB == PRESET_MIN_DB && max_dB == ZERO_DB && resolution == PRESET_RESOLUTION)
svol->dB_value = preset_dB_value;
else {
#ifndef HAVE_SOFT_FLOAT
- svol->dB_value = calloc(resolution, sizeof(unsigned short));
+ svol->dB_value = calloc(resolution, sizeof(unsigned int));
if (! svol->dB_value) {
SNDERR("cannot allocate dB table");
return -ENOMEM;
}
svol->min_dB = min_dB;
- for (i = 1; i < svol->max_val; i++) {
- double db = svol->min_dB - ((i - 1) * svol->min_dB) / (svol->max_val - 1);
+ svol->max_dB = max_dB;
+ for (i = 0; i <= svol->max_val; i++) {
+ double db = svol->min_dB + (i * (svol->max_dB - svol->min_dB)) / svol->max_val;
double v = (pow(10.0, db / 20.0) * (double)(1 << VOL_SCALE_SHIFT));
- svol->dB_value[i] = (unsigned short)v;
+ svol->dB_value[i] = (unsigned int)v;
}
- svol->dB_value[svol->max_val] = 65535;
+ if (svol->zero_dB_val)
+ svol->dB_value[svol->zero_dB_val] = 65535;
#else
- SNDERR("Cannot handle the given min_dB and resolution");
+ SNDERR("Cannot handle the given dB range and resolution");
return -EINVAL;
#endif
}
@@ -698,6 +743,7 @@
* \param ctl_id The control element
* \param cchannels PCM channels
* \param min_dB minimal dB value
+ * \param max_dB maximal dB value
* \param resolution resolution of control
* \param slave Slave PCM handle
* \param close_slave When set, the slave PCM handle is closed with copy PCM
@@ -710,7 +756,7 @@
snd_pcm_format_t sformat,
int ctl_card, snd_ctl_elem_id_t *ctl_id,
int cchannels,
- double min_dB, int resolution,
+ double min_dB, double max_dB, int resolution,
snd_pcm_t *slave, int close_slave)
{
snd_pcm_t *pcm;
@@ -728,7 +774,7 @@
if (! svol)
return -ENOMEM;
err = softvol_load_control(slave, svol, ctl_card, ctl_id, cchannels,
- min_dB, resolution);
+ min_dB, max_dB, resolution);
if (err < 0) {
softvol_free(svol);
return err;
@@ -812,6 +858,7 @@
[count INT] # control channels 1 or 2 (default: 2)
}
[min_dB REAL] # minimal dB value (default: -51.0)
+ [max_dB REAL] # maximal dB value (default: 0.0)
[resolution INT] # resolution (default: 256)
}
\endcode
@@ -851,6 +898,7 @@
snd_ctl_elem_id_t *ctl_id;
int resolution = PRESET_RESOLUTION;
double min_dB = PRESET_MIN_DB;
+ double max_dB = ZERO_DB;
int card = -1, cchannels = 2;
snd_config_for_each(i, next, conf) {
@@ -886,6 +934,14 @@
}
continue;
}
+ if (strcmp(id, "max_dB") == 0) {
+ err = snd_config_get_real(n, &max_dB);
+ if (err < 0) {
+ SNDERR("Invalid max_dB value");
+ return err;
+ }
+ continue;
+ }
SNDERR("Unknown field %s", id);
return -EINVAL;
}
@@ -901,6 +957,11 @@
SNDERR("min_dB must be a negative value");
return -EINVAL;
}
+ if (max_dB <= min_dB || max_dB > MAX_DB_UPPER_LIMIT) {
+ SNDERR("max_dB must be larger than min_dB and less than %d dB",
+ MAX_DB_UPPER_LIMIT);
+ return -EINVAL;
+ }
if (resolution < 0 || resolution > 1024) {
SNDERR("Invalid resolution value %d", resolution);
return -EINVAL;
@@ -930,7 +991,7 @@
return err;
}
err = snd_pcm_softvol_open(pcmp, name, sformat, card, ctl_id, cchannels,
- min_dB, resolution, spcm, 1);
+ min_dB, max_dB, resolution, spcm, 1);
if (err < 0)
snd_pcm_close(spcm);
return err;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/pcm/scopes/Makefile.in new/alsa-lib-1.0.14/src/pcm/scopes/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/pcm/scopes/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/pcm/scopes/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -76,9 +76,11 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibdir = $(libdir)/@PACKAGE@/scopes
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/rawmidi/Makefile.in new/alsa-lib-1.0.14/src/rawmidi/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/rawmidi/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/rawmidi/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -74,9 +74,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/seq/Makefile.in new/alsa-lib-1.0.14/src/seq/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/seq/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/seq/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -70,9 +70,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/src/timer/Makefile.in new/alsa-lib-1.0.14/src/timer/Makefile.in
--- old/alsa-lib-1.0.14rc4/src/timer/Makefile.in 2007-05-02 10:02:57.000000000 +0200
+++ new/alsa-lib-1.0.14/src/timer/Makefile.in 2007-05-31 10:05:23.000000000 +0200
@@ -70,9 +70,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/test/Makefile.in new/alsa-lib-1.0.14/test/Makefile.in
--- old/alsa-lib-1.0.14rc4/test/Makefile.in 2007-05-02 10:02:58.000000000 +0200
+++ new/alsa-lib-1.0.14/test/Makefile.in 2007-05-31 10:05:24.000000000 +0200
@@ -106,9 +106,11 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/utils/Makefile.in new/alsa-lib-1.0.14/utils/Makefile.in
--- old/alsa-lib-1.0.14rc4/utils/Makefile.in 2007-05-02 10:02:58.000000000 +0200
+++ new/alsa-lib-1.0.14/utils/Makefile.in 2007-05-31 10:05:24.000000000 +0200
@@ -63,9 +63,11 @@
DATA = $(aclocal_DATA) $(pkgconfig_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@
ALSA_DEPLIBS = @ALSA_DEPLIBS@
ALSA_HSEARCH_R_FALSE = @ALSA_HSEARCH_R_FALSE@
ALSA_HSEARCH_R_TRUE = @ALSA_HSEARCH_R_TRUE@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.14rc4/version new/alsa-lib-1.0.14/version
--- old/alsa-lib-1.0.14rc4/version 2007-05-02 10:03:08.000000000 +0200
+++ new/alsa-lib-1.0.14/version 2007-05-31 10:05:35.000000000 +0200
@@ -1 +1 @@
-1.0.14rc4
+1.0.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org