diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2004-11-29 11:07:59 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2004-11-29 11:07:59 +0100 |
| commit | 9c2d21818dc7029c4cdb7d220057afd0e9dfee8a (patch) | |
| tree | 7c3edf8189eafb7c8f64f9ad8c6c8d8b0989e300 /sound | |
| parent | d5adf0ccf5b07f956821b70ecf53d2602fa4b274 (diff) | |
| download | history-9c2d21818dc7029c4cdb7d220057afd0e9dfee8a.tar.gz | |
[ALSA] minor send routing cleanup
EMU10K1/EMU10K2 driver
Use snd_emu10k1_compose_audigy_fxrt* macro where appropriate. Also add
a few comments to explain send routing structure.
Signed-off-by: Lee Revell <rlrevell@joe-job.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/emu10k1/emupcm.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 080d9d490df6d5..0fe70290003cdf 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -267,6 +267,7 @@ static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu, send_routing[3] = 3; memset(send_amount, 0, sizeof(send_amount)); } else { + /* mono, left, right (master voice = left) */ tmp = stereo ? (master ? 1 : 2) : 0; memcpy(send_routing, &mix->send_routing[tmp][0], 8); memcpy(send_amount, &mix->send_volume[tmp][0], 8); @@ -292,15 +293,9 @@ static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu, // setup routing if (emu->audigy) { snd_emu10k1_ptr_write(emu, A_FXRT1, voice, - ((unsigned int)send_routing[3] << 24) | - ((unsigned int)send_routing[2] << 16) | - ((unsigned int)send_routing[1] << 8) | - (unsigned int)send_routing[0]); + snd_emu10k1_compose_audigy_fxrt1(send_routing)); snd_emu10k1_ptr_write(emu, A_FXRT2, voice, - ((unsigned int)send_routing[7] << 24) | - ((unsigned int)send_routing[6] << 16) | - ((unsigned int)send_routing[5] << 8) | - (unsigned int)send_routing[4]); + snd_emu10k1_compose_audigy_fxrt2(send_routing)); snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice, ((unsigned int)send_amount[4] << 24) | ((unsigned int)send_amount[5] << 16) | |