Page MenuHomeFreeBSD
Files F157212869

D55993.id174223.diff
No OneTemporary
Actions

D55993.id174223.diff
View Options

diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -306,8 +306,6 @@
int chn_getrates(struct pcm_channel *c, int **rates);
int chn_syncdestroy(struct pcm_channel *c);
-#define CHN_GETMUTE(x, y, z) ((x)->muted[y][z])
-
#ifdef OSSV4_EXPERIMENT
int chn_getpeaks(struct pcm_channel *c, int *lpeak, int *rpeak);
#endif
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -607,8 +607,9 @@
case MIXER_READ(0):
switch (j) {
case SOUND_MIXER_MUTE:
- mute = CHN_GETMUTE(ch, SND_VOL_C_PCM, SND_CHN_T_FL) ||
- CHN_GETMUTE(ch, SND_VOL_C_PCM, SND_CHN_T_FR);
+ mute = chn_getmute_matrix(ch,
+ SND_VOL_C_PCM, SND_CHN_T_FL) ||
+ chn_getmute_matrix(ch, SND_VOL_C_PCM, SND_CHN_T_FR);
if (ch->direction == PCMDIR_REC) {
*(int *)arg = mute << SOUND_MIXER_RECLEV;
} else {

File Metadata

Mime Type
text/plain
Expires
Wed, May 20, 9:32 AM (1 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33323974
Default Alt Text
D55993.id174223.diff (967 B)

Event Timeline