File alsa-lib-hcontrol-fix-compare-default.diff of Package alsa

Overview Repositories Revisions Requests Users Attributes Meta

File alsa-lib-hcontrol-fix-compare-default.diff of Package alsa (Revision 3929b436bf0fb81ffe9c2df81d9b0371)

Currently displaying revision 3929b436bf0fb81ffe9c2df81d9b0371 , Show latest

From 0110d62043589f0e3344d7af7ed33ac52da6b596 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 6 Oct 2009 10:46:54 +0200
Subject: [PATCH] hcontrol: fix compare_default function to handle also id.device and id.subdevice

In case when kcontrol differs only by device or subdevice numbers, the
find function can give wrong results.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 src/control/hcontrol.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c
index 181e767..1bfc015 100644
--- a/src/control/hcontrol.c
+++ b/src/control/hcontrol.c
@@ -471,8 +471,9 @@ int snd_hctl_compare_fast(const snd_hctl_elem_t *c1,
 static int snd_hctl_compare_default(const snd_hctl_elem_t *c1,
 				    const snd_hctl_elem_t *c2)
 {
-	int res;
-	int d = c1->id.iface - c2->id.iface;
+	int res, d;
+
+	d = c1->id.iface - c2->id.iface;
 	if (d != 0)
 		return d;
 	if (c1->id.iface == SNDRV_CTL_ELEM_IFACE_MIXER) {
@@ -480,11 +481,16 @@ static int snd_hctl_compare_default(const snd_hctl_elem_t *c1,
 		if (d != 0)
 			return d;
 	}
+	d = c1->id.device - c2->id.device;
+	if (d != 0)
+		return d;
+	d = c1->id.subdevice - c2->id.subdevice;
+	if (d != 0)
+		return d;
 	res = strcmp((const char *)c1->id.name, (const char *)c2->id.name);
 	if (res != 0)
 		return res;
-	d = c1->id.index - c2->id.index;
-	return d;
+	return c1->id.index - c2->id.index;
 }
 
 /**
-- 
1.6.4.2

Places

File alsa-lib-hcontrol-fix-compare-default.diff of Package alsa (Revision 3929b436bf0fb81ffe9c2df81d9b0371)

Places