Date: Wed, 14 Sep 2005 20:57:22 +0800 From: Ariff Abdullah <skywizard@MyBSD.org.my> To: Michael Nottebrock <lofi@freebsd.org> Cc: freebsd-multimedia@freebsd.org Subject: Re: As promised: Soft volume mixer controller Message-ID: <20050914205722.017ff911.skywizard@MyBSD.org.my> In-Reply-To: <200509141440.41530.lofi@freebsd.org> References: <20050913075835.5f055747.skywizard@MyBSD.org.my> <200509141241.22914.lofi@freebsd.org> <20050914201600.383df2ce.skywizard@MyBSD.org.my> <200509141440.41530.lofi@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Wed__14_Sep_2005_20_57_22_+0800_Y9p=P0re.Qxvs+09 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 14 Sep 2005 14:40:39 +0200 Michael Nottebrock <lofi@freebsd.org> wrote: > On Wednesday, 14. September 2005 14:16, Ariff Abdullah wrote: > > > It has always been the case. It's not a bug (depend on bug > > definition): dsp0.0 = hardware channel > > dsp0.1 = master / parent channel (feeder_mix_s16) > > dsp0.2,3,4,5 = virtual channel > > Oy. Good to know, that. > > > Ok, back to our real problem. Can you uncomment / restore back > > ac97_fix_volume(codec); , and apply this: > > Can you please resend that as a proper attachment? Fiddling diffs out > of a mail body is painful enough as it is, but this one also has > wrapped lines ... > Ok. -- Ariff Abdullah MyBSD http://www.MyBSD.org.my (IPv6/IPv4) http://staff.MyBSD.org.my (IPv6/IPv4) http://tomoyo.MyBSD.org.my (IPv6/IPv4) --Multipart=_Wed__14_Sep_2005_20_57_22_+0800_Y9p=P0re.Qxvs+09 Content-Type: text/plain; name="channel.c.diff" Content-Disposition: attachment; filename="channel.c.diff" Content-Transfer-Encoding: quoted-printable --- sys/dev/sound/pcm/channel.c.orig Wed Sep 14 19:47:43 2005 +++ sys/dev/sound/pcm/channel.c Wed Sep 14 19:48:04 2005 @@ -884,6 +884,7 @@ chn_lockdestroy(c); =20 return ret; +#if 0 } else if (c->direction =3D=3D PCMDIR_PLAY && c->parentsnddev && (c->parentsnddev->flags & SD_F_SOFTVOL) && c->parentsnddev->mixer_dev) { @@ -899,6 +900,7 @@ CHN_LOCK(c); chn_setvolume(c, vol & 0x7f, (vol >> 8) & 0x7f); CHN_UNLOCK(c); +#endif } =20 return 0; @@ -1331,7 +1333,8 @@ c->feederflags &=3D ~(1 << FEEDER_VOLUME); if (c->direction =3D=3D PCMDIR_PLAY && !(c->flags & (CHN_F_VIRTUAL|CHN_F_HAS_SLAVE)) && - c->parentsnddev && (c->parentsnddev->flags & SD_F_SOFTVOL)) + c->parentsnddev && (c->parentsnddev->flags & SD_F_SOFTVOL) && + c->parentsnddev->mixer_dev) c->feederflags |=3D 1 << FEEDER_VOLUME; flags =3D c->feederflags; fmtlist =3D chn_getcaps(c)->fmtlist; @@ -1396,6 +1399,17 @@ } =20 sndbuf_setfmt(c->bufhard, hwfmt); + + if ((flags & (1 << FEEDER_VOLUME))) { + int vol =3D 100 | (100 << 8); + + CHN_UNLOCK(c); + if (mixer_ioctl(c->parentsnddev->mixer_dev, + MIXER_READ(SOUND_MIXER_PCM), (caddr_t)&vol, -1, NULL) !=3D 0) + device_printf(c->dev, "Soft Volume: Failed to read default value\n"); + CHN_LOCK(c); + chn_setvolume(c, vol & 0x7f, (vol >> 8) & 0x7f); + } =20 return 0; } --Multipart=_Wed__14_Sep_2005_20_57_22_+0800_Y9p=P0re.Qxvs+09--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050914205722.017ff911.skywizard>