This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
d0e750e9f3
commit
554d660271
3
alsa-lib-1.0.14.tar.bz2
Normal file
3
alsa-lib-1.0.14.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
|
||||
size 785150
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e55912c5fa5b28f91138710aa29bfa5e982a0b707c9cf7bfc8612b60f6b95f17
|
||||
size 784451
|
||||
@ -1,588 +0,0 @@
|
||||
diff -r b557eb8496bb configure.in
|
||||
--- a/configure.in Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/configure.in Thu May 24 12:47:37 2007 +0200
|
||||
@@ -61,21 +61,41 @@ AC_SUBST(LIBTOOL_VERSION_INFO)
|
||||
|
||||
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 -r b557eb8496bb modules/mixer/simple/Makefile.am
|
||||
--- a/modules/mixer/simple/Makefile.am Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/modules/mixer/simple/Makefile.am Thu May 24 12:47:37 2007 +0200
|
||||
@@ -1,4 +1,4 @@ pkglibdir = $(libdir)/@PACKAGE@/smixer
|
||||
-pkglibdir = $(libdir)/@PACKAGE@/smixer
|
||||
+pkglibdir = @ALSA_PLUGIN_DIR@/smixer
|
||||
|
||||
AM_CFLAGS = -g -O2 -W -Wall
|
||||
|
||||
diff -r b557eb8496bb modules/mixer/simple/sbasedl.c
|
||||
--- a/modules/mixer/simple/sbasedl.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/modules/mixer/simple/sbasedl.c Thu May 24 12:47:37 2007 +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 -r b557eb8496bb src/alisp/alisp.c
|
||||
--- a/src/alisp/alisp.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/alisp/alisp.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -2395,7 +2395,7 @@ struct alisp_object * F_path(struct alis
|
||||
}
|
||||
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 -r b557eb8496bb src/conf.c
|
||||
--- a/src/conf.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/conf.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -580,12 +580,12 @@ static int get_char_skip_comments(input_
|
||||
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 @@ int snd_config_search_alias_hooks(snd_co
|
||||
#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 -r b557eb8496bb src/conf/Makefile.am
|
||||
--- a/src/conf/Makefile.am Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/conf/Makefile.am Thu May 24 12:47:37 2007 +0200
|
||||
@@ -10,5 +10,5 @@ endif
|
||||
|
||||
EXTRA_DIST = $(cfg_files)
|
||||
|
||||
-alsadir = $(datadir)/alsa
|
||||
+alsadir = @ALSA_CONFIG_DIR@
|
||||
alsa_DATA = $(cfg_files)
|
||||
diff -r b557eb8496bb src/conf/cards/HDA-Intel.conf
|
||||
--- a/src/conf/cards/HDA-Intel.conf Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/conf/cards/HDA-Intel.conf Thu May 24 12:47:37 2007 +0200
|
||||
@@ -44,8 +44,18 @@ HDA-Intel.pcm.default {
|
||||
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 -r b557eb8496bb src/conf/cards/Maestro3.conf
|
||||
--- a/src/conf/cards/Maestro3.conf Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/conf/cards/Maestro3.conf Thu May 24 12:47:37 2007 +0200
|
||||
@@ -21,8 +21,10 @@ Maestro3.pcm.default {
|
||||
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 -r b557eb8496bb src/conf/cards/Makefile.am
|
||||
--- a/src/conf/cards/Makefile.am Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/conf/cards/Makefile.am Thu May 24 12:47:37 2007 +0200
|
||||
@@ -1,4 +1,4 @@ alsadir = $(datadir)/alsa/cards
|
||||
-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)
|
||||
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 -r b557eb8496bb src/conf/pcm/Makefile.am
|
||||
--- a/src/conf/pcm/Makefile.am Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/conf/pcm/Makefile.am Thu May 24 12:47:37 2007 +0200
|
||||
@@ -7,5 +7,5 @@ cfg_files = default.conf front.conf rear
|
||||
|
||||
EXTRA_DIST = $(cfg_files)
|
||||
|
||||
-alsadir = $(datadir)/alsa/pcm
|
||||
+alsadir = @ALSA_CONFIG_DIR@/pcm
|
||||
alsa_DATA = $(cfg_files)
|
||||
diff -r b557eb8496bb src/confmisc.c
|
||||
--- a/src/confmisc.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/confmisc.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -588,7 +588,7 @@ int snd_func_datadir(snd_config_t **dst,
|
||||
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 -r b557eb8496bb src/control/control.c
|
||||
--- a/src/control/control.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/control/control.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -849,13 +849,13 @@ static int snd_ctl_open_conf(snd_ctl_t *
|
||||
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 -r b557eb8496bb src/mixer/simple_abst.c
|
||||
--- a/src/mixer/simple_abst.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/mixer/simple_abst.c Thu May 24 12:47:37 2007 +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 @@ int snd_mixer_simple_basic_register(snd_
|
||||
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 -r b557eb8496bb src/pcm/pcm.c
|
||||
--- a/src/pcm/pcm.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/pcm/pcm.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -2080,13 +2080,13 @@ static int snd_pcm_open_conf(snd_pcm_t *
|
||||
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 -r b557eb8496bb src/pcm/pcm_direct.c
|
||||
--- a/src/pcm/pcm_direct.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/pcm/pcm_direct.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -1528,7 +1528,7 @@ int snd_pcm_direct_parse_open_conf(snd_c
|
||||
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 -r b557eb8496bb src/pcm/pcm_rate.c
|
||||
--- a/src/pcm/pcm_rate.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/pcm/pcm_rate.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -1284,7 +1284,7 @@ static int rate_open_func(snd_pcm_rate_t
|
||||
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 -r b557eb8496bb src/pcm/pcm_softvol.c
|
||||
--- a/src/pcm/pcm_softvol.c Wed May 02 08:45:45 2007 +0200
|
||||
+++ b/src/pcm/pcm_softvol.c Thu May 24 12:47:37 2007 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
-
|
||||
+
|
||||
#include <byteswap.h>
|
||||
#include <math.h>
|
||||
#include "pcm_local.h"
|
||||
@@ -46,17 +46,22 @@ typedef struct {
|
||||
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
|
||||
-
|
||||
-static unsigned short preset_dB_value[PRESET_RESOLUTION] = {
|
||||
+#define ZERO_DB 0.0
|
||||
+#define MAX_DB_UPPER_LIMIT 50
|
||||
+
|
||||
+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 @@ typedef union {
|
||||
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 @@ static inline int MULTI_DIV_int(int a, u
|
||||
y.s[1] = x.s[0];
|
||||
y.i += (int)v.s[0] * b;
|
||||
#endif
|
||||
- return swap ? (int)bswap_32(y.i) : 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))
|
||||
+ return y.i;
|
||||
+}
|
||||
+
|
||||
+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 @@ static void softvol_convert_stereo_vol(s
|
||||
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 @@ static void softvol_convert_mono_vol(snd
|
||||
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 @@ static void snd_pcm_softvol_dump(snd_pcm
|
||||
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 @@ static int add_tlv_info(snd_pcm_softvol_
|
||||
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 @@ static int add_user_ctl(snd_pcm_softvol_
|
||||
{
|
||||
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 add_user_ctl(snd_pcm_softvol_
|
||||
*/
|
||||
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 @@ static int softvol_load_control(snd_pcm_
|
||||
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 @@ static int softvol_load_control(snd_pcm_
|
||||
}
|
||||
}
|
||||
|
||||
- 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[svol->max_val] = 65535;
|
||||
+ svol->dB_value[i] = (unsigned int)v;
|
||||
+ }
|
||||
+ 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 @@ static snd_pcm_ops_t snd_pcm_softvol_ops
|
||||
* \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 @@ int snd_pcm_softvol_open(snd_pcm_t **pcm
|
||||
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 @@ int snd_pcm_softvol_open(snd_pcm_t **pcm
|
||||
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 @@ pcm.name {
|
||||
[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 @@ int _snd_pcm_softvol_open(snd_pcm_t **pc
|
||||
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 @@ int _snd_pcm_softvol_open(snd_pcm_t **pc
|
||||
}
|
||||
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;
|
||||
}
|
||||
@@ -899,6 +955,11 @@ int _snd_pcm_softvol_open(snd_pcm_t **pc
|
||||
}
|
||||
if (min_dB >= 0) {
|
||||
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) {
|
||||
@@ -930,7 +991,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pc
|
||||
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;
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 31 12:23:49 CEST 2007 - tiwai@suse.de
|
||||
|
||||
- updated to version 1.0.14-final
|
||||
* including the previous HG fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 24 12:55:15 CEST 2007 - tiwai@suse.de
|
||||
|
||||
|
||||
15
alsa.spec
15
alsa.spec
@ -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 @@ Recommends: alsa-plugins alsa-oss
|
||||
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 @@ Source21: README.testwav
|
||||
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 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -n alsa-lib-%{package_version}
|
||||
%patch -p1
|
||||
# %patch -p1
|
||||
%{?suse_update_config:%{suse_update_config -f .}}
|
||||
|
||||
%build
|
||||
@ -261,6 +261,9 @@ exit 0
|
||||
%{_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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user