mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix snd_mixer_sort()

Browse source 
Fixed the wrong pointer use in snd_mixer_sort().
(Patch from https://bugs.gentoo.org/attachment.cgi?id=58918)
This commit is contained in:
Takashi Iwai 2005-05-17 09:34:18 +00:00
parent 51313cb2dd
commit 2ada7a8b81
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/mixer/mixer.c
View file

@ -45,6 +45,7 @@ This is an abstraction layer over the hcontrol layer.
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <pthread.h>
#include "mixer_local.h" #include "mixer_local.h"
#ifndef DOC_HIDDEN #ifndef DOC_HIDDEN
@ -520,14 +521,26 @@ static int snd_mixer_compare_default(const snd_mixer_elem_t *c1,
return c1->class->compare(c1, c2); return c1->class->compare(c1, c2);
} }
typedef int (*qsort_func)(const void *, const void *); static snd_mixer_t *compare_mixer;
static int mixer_compare(const void *a, const void *b) {
return compare_mixer->compare(*(const snd_mixer_elem_t * const *) a,
*(const snd_mixer_elem_t * const *) b);
}
static int snd_mixer_sort(snd_mixer_t *mixer) static int snd_mixer_sort(snd_mixer_t *mixer)
{ {
unsigned int k; unsigned int k;
static pthread_mutex_t sync_lock = PTHREAD_MUTEX_INITIALIZER;
assert(mixer); assert(mixer);
assert(mixer->compare); assert(mixer->compare);
INIT_LIST_HEAD(&mixer->elems); INIT_LIST_HEAD(&mixer->elems);
qsort(mixer->pelems, mixer->count, sizeof(snd_mixer_elem_t*), (qsort_func)mixer->compare);
pthread_mutex_lock(&sync_lock);
compare_mixer = mixer;
qsort(mixer->pelems, mixer->count, sizeof(snd_mixer_elem_t*), mixer_compare);
pthread_mutex_unlock(&sync_lock);
for (k = 0; k < mixer->count; k++) for (k = 0; k < mixer->count; k++)
list_add_tail(&mixer->pelems[k]->list, &mixer->elems); list_add_tail(&mixer->pelems[k]->list, &mixer->elems);
return 0; return 0;