From owner-freebsd-multimedia@FreeBSD.ORG Wed Sep 14 12:34:04 2005 Return-Path: X-Original-To: freebsd-multimedia@freebsd.org Delivered-To: freebsd-multimedia@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 094B516A43D; Wed, 14 Sep 2005 12:34:04 +0000 (GMT) (envelope-from skywizard@MyBSD.org.my) Received: from tomoyo.MyBSD.org.my (tomoyo.mybsd.org.my [202.157.186.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AE1643D46; Wed, 14 Sep 2005 12:34:03 +0000 (GMT) (envelope-from skywizard@MyBSD.org.my) Received: from localhost (localhost [127.0.0.1]) by tomoyo.MyBSD.org.my (Postfix) with ESMTP id 845806CC26; Wed, 14 Sep 2005 20:42:05 +0800 (MYT) Received: from tomoyo.MyBSD.org.my ([127.0.0.1]) by localhost (tomoyo.MyBSD.org.my [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 59857-01; Wed, 14 Sep 2005 20:42:03 +0800 (MYT) Received: from kasumi.MyBSD.org.my (unknown [218.111.181.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tomoyo.MyBSD.org.my (Postfix) with ESMTP id 9EA466CC22; Wed, 14 Sep 2005 20:42:03 +0800 (MYT) Date: Wed, 14 Sep 2005 20:34:45 +0800 From: Ariff Abdullah To: lofi@freebsd.org Message-Id: <20050914203445.2f8c1ae6.skywizard@MyBSD.org.my> In-Reply-To: <20050914201600.383df2ce.skywizard@MyBSD.org.my> References: <20050913075835.5f055747.skywizard@MyBSD.org.my> <200509140359.33175.lofi@freebsd.org> <20050914101228.4b688886.skywizard@MyBSD.org.my> <200509141241.22914.lofi@freebsd.org> <20050914201600.383df2ce.skywizard@MyBSD.org.my> Organization: MyBSD X-Mailer: /usr/local/lib/ruby/1.8/net/smtp.rb Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new-antivirus-mail-gateway at TOMOYO.MYBSD.ORG.MY Cc: freebsd-multimedia@freebsd.org Subject: Re: As promised: Soft volume mixer controller X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Sep 2005 12:34:04 -0000 On Wed, 14 Sep 2005 20:16:00 +0800 Ariff Abdullah wrote: > + MIXER_READ(SOUND_MIXER_PCM), (caddr_t)&vol, -1, NULL) != > 0) > + device_printf(c->dev, "Soft Volume: Failed to read default > value\n"); > + CHN_LOCK(c); > + chn_setvolume(c, vol & 0x7f, (vol >> 8) & 0x7f); > + } > > return 0; > } > > --- channel.c.diff END --- > > -- > Ooopsss... long lines was accidentaly wrapped. Again: --- channel.c.diff BEGIN --- --- 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); return ret; +#if 0 } else if (c->direction == 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 } return 0; @@ -1331,7 +1333,8 @@ c->feederflags &= ~(1 << FEEDER_VOLUME); if (c->direction == 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 |= 1 << FEEDER_VOLUME; flags = c->feederflags; fmtlist = chn_getcaps(c)->fmtlist; @@ -1396,6 +1399,17 @@ } sndbuf_setfmt(c->bufhard, hwfmt); + + if ((flags & (1 << FEEDER_VOLUME))) { + int vol = 100 | (100 << 8); + + CHN_UNLOCK(c); + if (mixer_ioctl(c->parentsnddev->mixer_dev, + MIXER_READ(SOUND_MIXER_PCM), (caddr_t)&vol, -1, NULL) != 0) + device_printf(c->dev, "Soft Volume: Failed to read default value\n"); + CHN_LOCK(c); + chn_setvolume(c, vol & 0x7f, (vol >> 8) & 0x7f); + } return 0; } --- channel.c.diff END --- -- Ariff Abdullah MyBSD http://www.MyBSD.org.my (IPv6/IPv4) http://staff.MyBSD.org.my (IPv6/IPv4) http://tomoyo.MyBSD.org.my (IPv6/IPv4)