- Audigy 1 and Audigy 2 mixer
PATCH 1/1 - Audigy 1 and Audigy 2 mixer
Hi,
These patches make some changes to mixer on Audigy 1 and Audigy 2.
Changes:
- new FX bus allocated for Wave Stereo playback ("Wave Playback Volume")
- new "Master Playback Volume" control - controls output volume for all channels (implemented using DSP code)
- new controls "PCM Front Playback Volume", "PCM Surround Playback Volume", "PCM Center Playback Volume", "PCM LFE Playback Volume" for multi-channel (5.1) playback
- new controls "Front Playback Volume", "Surround Playback Volume", "Center Playback Volume", "LFE Playback Volume" - there are just before master volume - controls mix from PCM (5.1) and Stereo Mix (Stereo Wave, AC97, ...)
- new controls "Stereo Mix Front Playback Volume", "Stereo Mix Surround Playback Volume", "Stereo Mix Center Playback Volume", "Stereo Mix LFE Playback Volume" - used do control volume of mix from stereo sources (make mirroring to 5.1 for stereo) Audigy 1:
- removed AC97 control "Master Volume Playback", "Master Mono Volume Playback", "PCM Volume Playback", "PCM Out Path & Mute" - there are unused
- uses Philips 6 channel DAC for all channels, WARNING: all analog sources are routed throught DSP (if you want listen line in you must set "AC97 Playback Volume" and "(" set capture on "(" "Line in" and "Capture" ")" or "(" capture on "Mix" and volume for "Line in" ")" using Philis DAC has some advantage - Same volume levels for all
channels, I think better signal, ..)
- analog signals can by routed to all channles
disadvantage - all analog signals must be routed throught DSP -
(confusing selecting analog inputs and volumes for analogs inputs)
I tested 5.1 playback, wave stereo playback midi playback and analog playback.
I hope I don't break something (OSS mixer, AC3 playback, optical input, output, coaxial input, output) - not tested.
Names are not very well choosen (some needs rename).
Maybe I can remove "Front Playback Volume", "Surround Playback Volume", "Center Playback Volume", "LFE Playback Volume" and use only controls for "PCM" and "Stereo Mix"
devices:
front - routed throught front channels of 5.1 PCM ("PCM Front" controls volume)
rear - routed throught rear channels of 5.1 PCM ("PCM Surround" controls volume)center_lfe - routed throught center, lfe channels of 5.1 PCM ("PCM Center" and "PCM LFE" controls volume)
default (stereo) - routed to stereo mix ("Wave" controls volume) Any suggestions, bugs, ...
Peter Zubaj
====================== REKLAMA ================================= Vyrazne zlavy pocitacov a prislusenstva
Sun Fire V210 server v cenach uz od 125.000,- Sk bez DPH Navstivte nas na adrese http://www.somi.sk/sun/lowend_servery.php
================================================================
alsa-kernel/include/emu10k1.h +8 -6
@@ -1144,18 +1144,20 @@#define CC_REG_NONZERO C_00000100/* FX buses */ -#define FXBUS_PCM_LEFT 0x00 -#define FXBUS_PCM_RIGHT 0x01 +#define FXBUS_WAVE_LEFT 0x00 +#define FXBUS_WAVE_RIGHT 0x01#define FXBUS_PCM_LEFT_REAR 0x02#define FXBUS_PCM_RIGHT_REAR 0x03#define FXBUS_MIDI_LEFT 0x04#define FXBUS_MIDI_RIGHT 0x05#define FXBUS_PCM_CENTER 0x06#define FXBUS_PCM_LFE 0x07 -#define FXBUS_PT_LEFT 20 -#define FXBUS_PT_RIGHT 21 +#define FXBUS_PCM_LEFT 0x08 +#define FXBUS_PCM_RIGHT 0x09#define FXBUS_MIDI_REVERB 0x0c#define FXBUS_MIDI_CHORUS 0x0d +#define FXBUS_PT_LEFT 0x14 +#define FXBUS_PT_RIGHT 0x15/* Inputs */ #define EXTIN_AC97_L 0x00/* AC'97 capture channel - left */
@@ -1249,8 +1251,8 @@#define A_C_4f1bbcdc 0xd3#define A_C_5a7ef9db 0xd4#define A_C_00100000 0xd5 -/* 0xd6 = 0x7fffffff (?) ACCUM? */ -/* 0xd7 = 0x0000000 CCR */ +#define A_GPR_ACCU 0xd6/* ACCUM, accumulator */ +#define A_GPR_COND 0xd7/* CCR, condition register */ /* 0xd8 = noise1 */ /* 0xd9 = noise2 */
alsa-kernel/pci/emu10k1/emufx.c +92 -62
247 lines not on this page · raw message
alsa-kernel/pci/emu10k1/emumixer.c +20 -10
@@ -468,17 +468,27 @@ ac97.private_free = snd_emu10k1_mixer_free_ac97;if ((err =snd_ac97_mixer (emu->card, &ac97, &emu->ac97)) <0 )return err; -if (emu->audigy && emu->revision ==4 ) { +if (emu->audigy) {/* Master/PCM controls on ac97 of Audigy2 has no effect */ -/* FIXME: keep master volume/switch to be sure. -* once after we check that they play really no roles, -* they shall be removed. -*/ -rename_ctl (card,"Master Playback Switch" ,"AC97 Master Playback Switch" ); -rename_ctl (card,"Master Playback Volume" ,"AC97 Master Playback Volume" );/* pcm controls are removed */ remove_ctl (card,"PCM Playback Switch" );remove_ctl (card,"PCM Playback Volume" ); + +if (emu->revision !=4 ) { +remove_ctl (card,"Master Mono Playback Switch" ); +remove_ctl (card,"Master Mono Playback Volume" ); +remove_ctl (card,"Master Playback Switch" ); +remove_ctl (card,"Master Playback Volume" ); +remove_ctl (card,"PCM Out Path & Mute" ); + }else { +/* FIXME: keep master volume/switch to be sure. +* once after we check that they play really no roles, +* they shall be removed. +*/ +rename_ctl (card,"Master Playback Switch" ,"AC97 Master Playback Switch" ); +rename_ctl (card,"Master Playback Volume" ,"AC97 Master Playback Volume" ); + } + } }else {if (emu->APS)
@@ -489,11 +499,11 @@strcpy (emu->card->mixername,"Emu10k1" ); } -if (emu->audigy && emu->revision ==4 ) { +if (emu->audigy) {/* Audigy2 and Audigy2 EX */ /* use the conventional names */ -rename_ctl (card,"Wave Playback Volume" ,"PCM Playback Volume" ); -rename_ctl (card,"Wave Playback Volume" ,"PCM Capture Volume" ); +/*rename_ctl(card, "Wave Playback Volume", "PCM Playback Volume"); +rename_ctl(card, "Wave Playback Volume", "PCM Capture Volume");*/ rename_ctl (card,"Wave Master Playback Volume" ,"Master Playback Volume" ); }
src/conf/cards/Audigy2.conf +26 -22
69 lines not on this page · raw message
src/conf/cards/Audigy.conf +26 -22
69 lines not on this page · raw message
At Fri, 10 Oct 2003 08:53:34 +0200,
Quoted 5 lines · p z oooo
[1 <text/plain; US-ASCII (quoted-printable)>]
Hi,These patches make some changes to mixer on Audigy 1 and Audigy 2.
thanks, i'll try and merge your patch in the next week when i get the audigy board back.
Quoted 31 lines
Changes:
- new FX bus allocated for Wave Stereo playback ("Wave Playback Volume")
- new "Master Playback Volume" control - controls output volume for all channels (implemented using DSP code)
- new controls "PCM Front Playback Volume", "PCM Surround Playback Volume", "PCM Center Playback Volume", "PCM LFE Playback Volume" for multi-channel (5.1) playback
- new controls "Front Playback Volume", "Surround Playback Volume", "Center Playback Volume", "LFE Playback Volume" - there are just before master volume - controls mix from PCM (5.1) and Stereo Mix (Stereo Wave, AC97, ...)
- new controls "Stereo Mix Front Playback Volume", "Stereo Mix Surround Playback Volume", "Stereo Mix Center Playback Volume", "Stereo Mix LFE Playback Volume" - used do control volume of mix from stereo sources (make mirroring to 5.1 for stereo) Audigy 1:
- removed AC97 control "Master Volume Playback", "Master Mono Volume Playback", "PCM Volume Playback", "PCM Out Path & Mute" - there are unused
- uses Philips 6 channel DAC for all channels, WARNING: all analog sources are routed throught DSP (if you want listen line in you must set "AC97 Playback Volume" and "(" set capture on "(" "Line in" and "Capture" ")" or "(" capture on "Mix" and volume for "Line in" ")" using Philis DAC has some advantage - Same volume levels for all
channels, I think better signal, ..)
- analog signals can by routed to all channles
disadvantage - all analog signals must be routed throught DSP -
(confusing selecting analog inputs and volumes for analogs inputs)
Quoted 8 lines
I tested 5.1 playback, wave stereo playback midi playback and analog playback.
I hope I don't break something (OSS mixer, AC3 playback, optical input, output, coaxial input, output) - not tested.
Names are not very well choosen (some needs rename).
Maybe I can remove "Front Playback Volume", "Surround Playback Volume", "Center Playback Volume", "LFE Playback Volume" and use only controls for "PCM" and "Stereo Mix"
agreed. "Stereo Mix xxx Playback" can be simply used as "xxx Playback", then.
also, the "PCM" might be a bit confusing in this case, since the normal playback is not affected by these controls.
anyway, thanks for your work!
Takashi
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. SourceForge.net hosts over 70,000 Open Source Projects. See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
Hi,
At Fri, 10 Oct 2003 08:53:34 +0200,
Quoted 5 lines · p z oooo
[1 <text/plain; US-ASCII (quoted-printable)>]
Hi,These patches make some changes to mixer on Audigy 1 and Audigy 2.
i applied the patch to cvs with minor modifications as below:
- the original "Front", "Rear", "Center", "LFE" are removed. instead, Stereo Mix Front, Rear, Center and LFE are renamed without "Stereo Mix" prefix.
- "Wave Playback" is renamed as "PCM" as well as before, so that it can be controlled via OSS.
- master is initialized as 0, while PCM are set to max.
i've not tested AC3 output yet. others seem working fine.
again, thanks for the patch!
ciao,
Takashi
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. SourceForge.net hosts over 70,000 Open Source Projects. See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php