mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

control: rename snd_ctl_elem_id_compare() to snd_ctl_elem_id_compare_set()

Browse source 
- add asserts to check if the unsigned integers are in the valid range
- replace tuple with set in the id description
- add const prefix for id1

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-03-23 17:30:25 +01:00
parent 2f57b404b1
commit 6f4b96ecc9
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/control.h
View file

@ -424,7 +424,7 @@ int snd_ctl_elem_id_malloc(snd_ctl_elem_id_t **ptr);
void snd_ctl_elem_id_free(snd_ctl_elem_id_t *obj);
void snd_ctl_elem_id_clear(snd_ctl_elem_id_t *obj);
void snd_ctl_elem_id_copy(snd_ctl_elem_id_t *dst, const snd_ctl_elem_id_t *src);
int snd_ctl_elem_id_compare(snd_ctl_elem_id_t *id1, const snd_ctl_elem_id_t *id2);
int snd_ctl_elem_id_compare_set(const snd_ctl_elem_id_t *id1, const snd_ctl_elem_id_t *id2);
unsigned int snd_ctl_elem_id_get_numid(const snd_ctl_elem_id_t *obj);
snd_ctl_elem_iface_t snd_ctl_elem_id_get_interface(const snd_ctl_elem_id_t *obj);
unsigned int snd_ctl_elem_id_get_device(const snd_ctl_elem_id_t *obj);

21
src/control/control.c
View file

@ -77,12 +77,12 @@ Each element has the following identifying properties:
- Its name
- Its index
An element can be identified either by its numid or by the tuple
(interface type, device, subdevice, name, index). This tuple is always
the same (driver updates can change it, but in practice this is
rare). The numid can change on each boot. In case of an USB sound
card, the numid can also change when it is reconnected.
An element can be identified either by its short numid or by the full
set of fields (interface type, device, subdevice, name, index).
This set of fields is always the same (driver updates can change it,
but in practice this is rare). The numid can change on each boot.
In case of an USB sound card, the numid can also change when it
is reconnected. The short numid is used to reduce the lookup time.
\section element_lists Element Lists
@ -153,6 +153,7 @@ against the original design.
#include <signal.h>
#include <poll.h>
#include <stdbool.h>
#include <limits.h>
#include "control_local.h"
/**
@ -1827,17 +1828,21 @@ void snd_ctl_elem_id_copy(snd_ctl_elem_id_t *dst, const snd_ctl_elem_id_t *src)
* This comparison ignores the numid part. The numid comparison can be easily
* implemented using snd_ctl_elem_id_get_numid() calls.
*
* The identifier fields are compared in this order: interface, device,
* The identifier set fields are compared in this order: interface, device,
* subdevice, name, index.
*
* The return value can be used for sorting like qsort(). It gives persistent
* results.
*/
int snd_ctl_elem_id_compare(snd_ctl_elem_id_t *id1, const snd_ctl_elem_id_t *id2)
int snd_ctl_elem_id_compare_set(const snd_ctl_elem_id_t *id1, const snd_ctl_elem_id_t *id2)
{
int d;
assert(id1 && id2);
/* although those values are unsigned integer, practically, */
/* the useable limit is really much lower */
assert((id1->iface | id1->device | id1->subdevice | id1->index) <= INT_MAX);
assert((id2->iface | id2->device | id2->subdevice | id1->index) <= INT_MAX);
d = id1->iface - id2->iface;
if (d != 0)
return d;