[PATCH (alsa-utils)] amixer: Print TLV of channel map controls

[PATCH (alsa-utils)] amixer: Print TLV of channel map controls

[David Henningsson]

Previously these were written as "unk-25..." which wasn't very user friendly.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 amixer/amixer.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/amixer/amixer.c b/amixer/amixer.c
index fe83b49..7727943 100644
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -443,6 +443,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 	unsigned int type = tlv[0];
 	unsigned int size;
 	unsigned int idx = 0;
+	const char *chmap_type = NULL;
 
 	if (tlv_size < 2 * sizeof(unsigned int)) {
 		printf("TLV size error!\n");
@@ -541,6 +542,27 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 		}
 		break;
 #endif
+#ifdef SND_CTL_TLVT_CHMAP_FIXED
+	case SND_CTL_TLVT_CHMAP_FIXED:
+		chmap_type = "fixed";
+		/* Fall through */
+	case SND_CTL_TLVT_CHMAP_VAR:
+		if (!chmap_type)
+			chmap_type = "variable";
+		/* Fall through */
+	case SND_CTL_TLVT_CHMAP_PAIRED:
+		if (!chmap_type)
+			chmap_type = "paired";
+		printf("chmap-%s=", chmap_type);
+
+		while (size > 0) {
+			printf("%s", snd_pcm_chmap_name(tlv[idx++]));
+			size -= sizeof(unsigned int);
+			if (size > 0)
+				printf(",");
+		}
+		break;
+#endif
 	default:
 		printf("unk-%i-", type);
 		while (size > 0) {
-- 
1.8.3

Re: [PATCH (alsa-utils)] amixer: Print TLV of channel map controls

[Jaroslav Kysela]

Date 14.6.2013 11:41, David Henningsson wrote:
> Previously these were written as "unk-25..." which wasn't very user friendly.
> 
> Signed-off-by: David Henningsson <david.henningsson@canonical.com>

Applied to repo. Thanks.

					Jaroslav

-- 
Jaroslav Kysela <perex@perex.cz>
Linux Kernel Sound Maintainer
ALSA Project; Red Hat, Inc.

Re: [PATCH (alsa-utils)] amixer: Print TLV of channel map controls

[David Henningsson]

On 06/14/2013 01:39 PM, Jaroslav Kysela wrote:
> Date 14.6.2013 11:41, David Henningsson wrote:
>> Previously these were written as "unk-25..." which wasn't very user friendly.
>>
>> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>
> Applied to repo. Thanks.

Thanks, would you mind taking the alsa-utils and alsa-lib patches I 
posted two days ago too? Especially the alsa-lib one looked quite serious.



-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

Re: [PATCH (alsa-utils)] amixer: Print TLV of channel map controls

[David Henningsson]

On 06/14/2013 01:55 PM, David Henningsson wrote:
> On 06/14/2013 01:39 PM, Jaroslav Kysela wrote:
>> Date 14.6.2013 11:41, David Henningsson wrote:
>>> Previously these were written as "unk-25..." which wasn't very user
>>> friendly.
>>>
>>> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>>
>> Applied to repo. Thanks.
>
> Thanks, would you mind taking the alsa-utils and alsa-lib patches I
> posted two days ago too? Especially the alsa-lib one looked quite serious.

Reference: 
http://mailman.alsa-project.org/pipermail/alsa-devel/2013-June/062922.html


-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

Re: [PATCH (alsa-utils)] amixer: Print TLV of channel map controls

[Jaroslav Kysela]

Date 14.6.2013 13:57, David Henningsson wrote:
> On 06/14/2013 01:55 PM, David Henningsson wrote:
>> On 06/14/2013 01:39 PM, Jaroslav Kysela wrote:
>>> Date 14.6.2013 11:41, David Henningsson wrote:
>>>> Previously these were written as "unk-25..." which wasn't very user
>>>> friendly.
>>>>
>>>> Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>>>
>>> Applied to repo. Thanks.
>>
>> Thanks, would you mind taking the alsa-utils and alsa-lib patches I
>> posted two days ago too? Especially the alsa-lib one looked quite serious.
> 
> Reference: 
> http://mailman.alsa-project.org/pipermail/alsa-devel/2013-June/062922.html

I applied all user-space related patches from you since 10th.

				Thanks,
					Jaroslav

-- 
Jaroslav Kysela <perex@perex.cz>
Linux Kernel Sound Maintainer
ALSA Project; Red Hat, Inc.