From owner-svn-src-all@FreeBSD.ORG  Thu Nov  1 20:43:24 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 93556692;
 Thu,  1 Nov 2012 20:43:24 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 7AD058FC14;
 Thu,  1 Nov 2012 20:43:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA1KhOXL072662;
 Thu, 1 Nov 2012 20:43:24 GMT (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA1KhOKn072660;
 Thu, 1 Nov 2012 20:43:24 GMT (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201211012043.qA1KhOKn072660@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 1 Nov 2012 20:43:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242455 - head/sys/dev/sound/usb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Nov 2012 20:43:24 -0000

Author: hselasky
Date: Thu Nov  1 20:43:23 2012
New Revision: 242455
URL: http://svn.freebsd.org/changeset/base/242455

Log:
  Increase default volume for FastTracker playback channels.
  
  MFC after:	1 week

Modified:
  head/sys/dev/sound/usb/uaudio.c

Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c	Thu Nov  1 20:39:39 2012	(r242454)
+++ head/sys/dev/sound/usb/uaudio.c	Thu Nov  1 20:43:23 2012	(r242455)
@@ -2250,7 +2250,7 @@ uaudio_mixer_controls_create_ftu(struct 
 			mix.name = "mix_play";
 			mix.nchan = 1;
 			mix.update[0] = 1;
-			mix.val_default = (chx == chy) ? 1 : 0;
+			mix.val_default = (chx == chy) ? 2 : 0;
 			snprintf(mix.desc, sizeof(mix.desc),
 			    "DIn%d - Out%d Playback Volume", chy + 1, chx + 1);
 
@@ -2391,12 +2391,15 @@ uaudio_mixer_add_ctl_sub(struct uaudio_s
 		for (ch = 0; ch < p_mc_new->nchan; ch++) {
 			switch (p_mc_new->val_default) {
 			case 1:
+				/* 50% */
 				p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2;
 				break;
 			case 2:
+				/* 100% */
 				p_mc_new->wData[ch] = p_mc_new->maxval;
 				break;
 			default:
+				/* 0% */
 				p_mc_new->wData[ch] = p_mc_new->minval;
 				break;
 			}