From owner-freebsd-gecko@FreeBSD.ORG  Sun Dec  1 01:45:03 2013
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 118F3F63
 for <freebsd-gecko@freebsd.org>; Sun,  1 Dec 2013 01:45:03 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9774A176D
 for <freebsd-gecko@freebsd.org>; Sun,  1 Dec 2013 01:45:02 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rB11j0Wc041352
 for <freebsd-gecko@freebsd.org>; Sun, 1 Dec 2013 01:45:00 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rB11itRY040950
 for freebsd-gecko@freebsd.org; Sun, 1 Dec 2013 01:44:55 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sun, 1 Dec 2013 01:44:55 GMT
Message-Id: <201312010144.rB11itRY040950@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1420 - trunk/audio/alsa-plugins/files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Dec 2013 01:45:03 -0000

Author: jbeich
Date: Sun Dec  1 01:44:55 2013
New Revision: 1420

Log:
reclev can coexist with igain on snd_hda(4)

http://forums.freebsd.org/viewtopic.php?f=19&t=42051

Modified:
   trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c

Modified: trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c
==============================================================================
--- trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c	Sun Dec  1 01:11:50 2013	(r1419)
+++ trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c	Sun Dec  1 01:44:55 2013	(r1420)
@@ -12,3 +12,12 @@
  
  typedef struct snd_ctl_oss {
  	snd_ctl_ext_t ext;
+@@ -53,7 +57,7 @@ static const char *const vol_devices[SOU
+ 	[SOUND_MIXER_IMIX] =	"Monitor Mix Playback Volume",
+ 	[SOUND_MIXER_ALTPCM] =	"Headphone Playback Volume",
+ 	[SOUND_MIXER_RECLEV] =	"Capture Volume",
+-	[SOUND_MIXER_IGAIN] =	"Capture Volume",
++	[SOUND_MIXER_IGAIN] =	"Master Capture Volume",
+ 	[SOUND_MIXER_OGAIN] =	"Playback Volume",
+ 	[SOUND_MIXER_LINE1] =	"Aux Playback Volume",
+ 	[SOUND_MIXER_LINE2] =	"Aux1 Playback Volume",