sound: Retire CHN_SETVOLUME() and use chn_setvolume_matrix()

CHN_SETVOLUME() is just a wrapped around chn_setvolume_matrix() anyway,
so use it directly.

Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D55992
This commit is contained in:
Christos Margiolis
2026-03-24 11:32:04 +01:00
parent f190fad18c
commit 127aa056fe
3 changed files with 3 additions and 6 deletions
+2 -2
View File
@@ -143,7 +143,7 @@ chn_vpc_proc(int reset, int db)
PCM_ACQUIRE(d);
CHN_FOREACH(c, d, channels.pcm) {
CHN_LOCK(c);
CHN_SETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_VOL_0DB, db);
chn_setvolume_matrix(c, SND_VOL_C_PCM, SND_CHN_T_VOL_0DB, db);
if (reset != 0)
chn_vpc_reset(c, SND_VOL_C_PCM, 1);
CHN_UNLOCK(c);
@@ -1635,7 +1635,7 @@ chn_vpc_reset(struct pcm_channel *c, int vc, int force)
return;
for (i = SND_CHN_T_BEGIN; i <= SND_CHN_T_END; i += SND_CHN_T_STEP)
CHN_SETVOLUME(c, vc, i, c->volume[vc][SND_CHN_T_VOL_0DB]);
chn_setvolume_matrix(c, vc, i, c->volume[vc][SND_CHN_T_VOL_0DB]);
}
static u_int32_t
-2
View File
@@ -306,8 +306,6 @@ int chn_notify(struct pcm_channel *c, u_int32_t flags);
int chn_getrates(struct pcm_channel *c, int **rates);
int chn_syncdestroy(struct pcm_channel *c);
#define CHN_SETVOLUME(...) chn_setvolume_matrix(__VA_ARGS__)
#define CHN_GETMUTE(x, y, z) ((x)->muted[y][z])
#ifdef OSSV4_EXPERIMENT
+1 -2
View File
@@ -176,8 +176,7 @@
/*
* Multichannel interleaved volume matrix. Each calculated value relative
* to master and 0db will be stored in each CLASS + 1 as long as
* chn_setvolume_matrix() or the equivalent CHN_SETVOLUME() macros is
* used (see channel.c).
* chn_setvolume_matrix() is used (see channel.c).
*/
#define SND_VOL_C_MASTER 0
#define SND_VOL_C_PCM 1