mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More EMU10K1 fixes.

Browse source
This commit is contained in:
Jaroslav Kysela 2001-05-14 15:50:09 +00:00
parent 6cb24e0186
commit 8df53e998e
2 changed files with 65 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/pcm/pcm_surr.c
View file

@ -859,7 +859,44 @@ int load_surround_config(snd_ctl_t *ctl, snd_pcm_surround_t *surr,
err = -ENODEV;
goto __error;
}
if (snd_config_search(n, "open_control", &n1) >= 0) {
if (stype == SND_PCM_SURROUND_40 && snd_config_search(n, "open_control_four", &n1) >= 0) {
snd_sctl_replace_t replace[3];
char values[2][10] = { "123", "123" };
snd_pcm_info_t *info;
int ridx = 0;
snd_pcm_info_alloca(&info);
if ((err = snd_pcm_info(surr->pcm[0], info)) < 0) {
SNDERR("snd_pcm_info failed", snd_strerror(err));
goto __error;
}
sprintf(values[0], "%i", snd_pcm_info_get_subdevice(info));
replace[ridx].key = "index";
replace[ridx].old_value = "subdevice0";
replace[ridx].new_value = values[0];
ridx++;
if (surr->pcm[1]) {
if ((err = snd_pcm_info(surr->pcm[1], info)) < 0) {
SNDERR("snd_pcm_info failed", snd_strerror(err));
goto __error;
}
sprintf(values[1], "%i", snd_pcm_info_get_subdevice(info));
replace[ridx].key = "index";
replace[ridx].old_value = "subdevice1";
replace[ridx].new_value = values[1];
ridx++;
}
replace[ridx].key = NULL;
replace[ridx].old_value = NULL;
replace[ridx].new_value = NULL;
if ((err = snd_sctl_build(ctl, &surr->store, n1, replace)) < 0) {
SNDERR("snd_sctl_build : %s\n", snd_strerror(err));
goto __error;
}
}
if ((stype == SND_PCM_SURROUND_51 && snd_config_search(n, "open_control_six", &n1) >= 0) ||
snd_config_search(n, "open_control", &n1) >= 0) {
snd_sctl_replace_t replace[4];
char values[3][10] = { "123", "123", "123" };
snd_pcm_info_t *info;

30
src/pcm/surround.conf
View file

@ -148,7 +148,7 @@ surround_plugin.EMU10K1 {
device.2 = 0;
subdevice.2 = -1;
}
open_control.0 {
open_control_four.0 {
iface = MIXER;
name = 'Wave Surround Playback Volume';
index = 0;
@ -158,7 +158,31 @@ surround_plugin.EMU10K1 {
value.1 = 0;
}
# change send volume from front to rear
open_control.1 {
open_control_four.1 {
iface = MIXER;
name = 'EMU10K1 PCM Send Volume';
index = subdevice1;
lock = true;
value.4 = 0;
value.5 = 0;
value.6 = 255;
value.7 = 0;
value.8 = 0;
value.9 = 0;
value.10 = 0;
value.11 = 255;
}
open_control_six.0 {
iface = MIXER;
name = 'Wave Surround Playback Volume';
index = 0;
lock = true;
preserve = true;
value.0 = 0;
value.1 = 0;
}
# change send volume from front to rear
open_control_six.1 {
iface = MIXER;
name = 'EMU10K1 PCM Send Volume';
index = subdevice1;
@ -173,7 +197,7 @@ surround_plugin.EMU10K1 {
value.11 = 255;
}
# send routing must be changed to 6 (center) and 7 (LFE)
open_control.2 {
open_control_six.2 {
iface = MIXER;
name = 'EMU10K1 PCM Send Routing';
index = subdevice2;