From: linux@audioscience.com
To: tiwai@suse.de
Cc: Eliot Blennerhassett <eblennerhassett@audioscience.com>,
alsa-devel@alsa-project.org
Subject: [PATCH 04/21] Volumes and meters may have 1 or 2 channels.
Date: Thu, 22 Dec 2011 13:38:34 +1300 [thread overview]
Message-ID: <1324514331-22570-5-git-send-email-linux@audioscience.com> (raw)
In-Reply-To: <1324514331-22570-1-git-send-email-linux@audioscience.com>
From: Eliot Blennerhassett <eblennerhassett@audioscience.com>
The channel count can be queried to determine which.
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
sound/pci/asihpi/asihpi.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index a97a252..cf5baa2 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1410,6 +1410,7 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
u32 h_control = kcontrol->private_value;
+ u32 count;
u16 err;
/* native gains are in millibels */
short min_gain_mB;
@@ -1424,8 +1425,12 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,
step_gain_mB = VOL_STEP_mB;
}
+ err = hpi_meter_query_channels(h_control, &count);
+ if (err)
+ count = HPI_MAX_CHANNELS;
+
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
- uinfo->count = 2;
+ uinfo->count = count;
uinfo->value.integer.min = min_gain_mB / VOL_STEP_mB;
uinfo->value.integer.max = max_gain_mB / VOL_STEP_mB;
uinfo->value.integer.step = step_gain_mB / VOL_STEP_mB;
@@ -2033,8 +2038,15 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
static int snd_asihpi_meter_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
+ u32 h_control = kcontrol->private_value;
+ u32 count;
+ u16 err;
+ err = hpi_meter_query_channels(h_control, &count);
+ if (err)
+ count = HPI_MAX_CHANNELS;
+
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
- uinfo->count = HPI_MAX_CHANNELS;
+ uinfo->count = count;
uinfo->value.integer.min = 0;
uinfo->value.integer.max = 0x7FFFFFFF;
return 0;
--
1.7.0.4
next prev parent reply other threads:[~2011-12-22 0:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-22 0:38 [PATCH 00/21] ALSA: asihpi - update to 4.10 linux
2011-12-22 0:38 ` [PATCH 01/21] Split hpi version info into separate header file linux
2011-12-22 0:38 ` [PATCH 02/21] Update copyright to 2011 linux
2011-12-22 0:38 ` [PATCH 03/21] Low latency mode stream has fixed channel count linux
2011-12-22 0:38 ` linux [this message]
2011-12-22 0:38 ` [PATCH 05/21] Use snd_pcm_debug_name to get substream name linux
2011-12-22 0:38 ` [PATCH 06/21] Correct stray capital letters in identifier linux
2011-12-22 0:38 ` [PATCH 07/21] Relax drained check for more reliable playback startup linux
2011-12-22 0:38 ` [PATCH 08/21] Only set sync if card supports hardware stream grouping linux
2011-12-22 0:38 ` [PATCH 09/21] Update node types linux
2011-12-22 0:38 ` [PATCH 10/21] Remove unused structs and defs linux
2011-12-22 0:38 ` [PATCH 11/21] Add new function codes linux
2011-12-22 0:38 ` [PATCH 12/21] Increase debug response buffer size linux
2011-12-22 0:38 ` [PATCH 13/21] Remove redundant struct members linux
2011-12-22 0:38 ` [PATCH 14/21] Simplify dsp code close linux
2011-12-22 0:38 ` [PATCH 15/21] Add autofade query linux
2011-12-22 0:38 ` [PATCH 16/21] New defs and comments linux
2011-12-22 0:38 ` [PATCH 17/21] Distinguish four different emif init errors linux
2011-12-22 0:38 ` [PATCH 18/21] Add HPI version to module description linux
2011-12-22 0:38 ` [PATCH 19/21] Correct headers in cached control responses linux
2011-12-22 0:38 ` [PATCH 20/21] Use valid channel count in format enumeration linux
2011-12-22 0:38 ` [PATCH 21/21] Fix format validity check linux
2011-12-22 7:15 ` [PATCH 00/21] ALSA: asihpi - update to 4.10 Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324514331-22570-5-git-send-email-linux@audioscience.com \
--to=linux@audioscience.com \
--cc=alsa-devel@alsa-project.org \
--cc=eblennerhassett@audioscience.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox