From: linux@audioscience.com
To: patch@alsa-project.org
Cc: tiwai@suse.de,
Eliot Blennerhassett <eblennerhassett@audioscience.com>,
alsa-devel@alsa-project.org
Subject: [snd-asihpi 1/8] Clock source is neither capture nor playback. Add spaces to control name string for consistency.
Date: Fri, 01 Apr 2011 15:59:45 +1300 [thread overview]
Message-ID: <1301626792-13705-2-git-send-email-linux@audioscience.com> (raw)
In-Reply-To: <1301626792-13705-1-git-send-email-linux@audioscience.com>
From: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
pci/asihpi/asihpi.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pci/asihpi/asihpi.c b/pci/asihpi/asihpi.c
index f53a31e..edcbe39 100644
--- a/pci/asihpi/asihpi.c
+++ b/pci/asihpi/asihpi.c
@@ -1413,14 +1413,16 @@ static void asihpi_ctl_init(struct snd_kcontrol_new *snd_control,
struct hpi_control *hpi_ctl,
char *name)
{
- char *dir = "";
+ char *dir;
memset(snd_control, 0, sizeof(*snd_control));
snd_control->name = hpi_ctl->name;
snd_control->private_value = hpi_ctl->h_control;
snd_control->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
snd_control->index = 0;
- if (hpi_ctl->dst_node_type + HPI_DESTNODE_NONE == HPI_DESTNODE_ISTREAM)
+ if (hpi_ctl->src_node_type + HPI_SOURCENODE_NONE == HPI_SOURCENODE_CLOCK_SOURCE)
+ dir = ""; /* clock is neither capture nor playback */
+ else if (hpi_ctl->dst_node_type + HPI_DESTNODE_NONE == HPI_DESTNODE_ISTREAM)
dir = "Capture "; /* On or towards a PCM capture destination*/
else if ((hpi_ctl->src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &&
(!hpi_ctl->dst_node_type))
@@ -1433,7 +1435,7 @@ static void asihpi_ctl_init(struct snd_kcontrol_new *snd_control,
dir = "Playback "; /* PCM Playback source, or output node */
if (hpi_ctl->src_node_type && hpi_ctl->dst_node_type)
- sprintf(hpi_ctl->name, "%s%d %s%d %s%s",
+ sprintf(hpi_ctl->name, "%s %d %s %d %s%s",
asihpi_src_names[hpi_ctl->src_node_type],
hpi_ctl->src_node_index,
asihpi_dst_names[hpi_ctl->dst_node_type],
--
1.7.0.4
next prev parent reply other threads:[~2011-04-01 2:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 2:59 [snd-asihpi 0/8] Updates to snd-asihpi driver linux
2011-04-01 2:59 ` linux [this message]
2011-04-01 13:09 ` [snd-asihpi 1/8] Clock source is neither capture nor playback. Add spaces to control name string for consistency Takashi Iwai
2011-04-04 23:58 ` Eliot Blennerhassett
2011-04-05 5:22 ` Takashi Iwai
2011-04-01 2:59 ` [snd-asihpi 2/8] Debug print full substream ID. Other minor debug print updates linux
2011-04-01 2:59 ` [snd-asihpi 3/8] More forgiving handling of card playback drained status linux
2011-04-01 2:59 ` [snd-asihpi 4/8] Allow older non DMA capable cards to use MMAP. Emulate the DMA using read and write functions, get rid of copy & silence callbacks that were used only by older cards linux
2011-04-01 2:59 ` [snd-asihpi 5/8] Remove 2 unused functions linux
2011-04-01 2:59 ` [snd-asihpi 6/8] Define pcm_debug_name if CONFIG_SND_DEBUG linux
2011-04-01 2:59 ` [snd-asihpi 7/8] Replace subsys_delete_adapter with adapter_delete This allows some special-case code to be removed linux
2011-04-01 2:59 ` [snd-asihpi 8/8] Minor cleanups including %pR to print resource linux
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=1301626792-13705-2-git-send-email-linux@audioscience.com \
--to=linux@audioscience.com \
--cc=alsa-devel@alsa-project.org \
--cc=eblennerhassett@audioscience.com \
--cc=patch@alsa-project.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.