Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ALSA: oss-mixer - Fixes recording gain control

At the time of initialization, SNDRV_MIXER_OSS_PRESENT_PVOLUME bit is not
set for MIC (slot 7).
So, the same should not be checked when an application tries to do gain
control for audio recording devices.

Just check slot->present for SNDRV_MIXER_OSS_PRESENT_CVOLUME independently.
Verified with a simple application which opens /dev/dsp for recording and
/dev/mixer for volume control.

Have tested two usb audio mic devices.

Signed-off-by: Viral Mehta <viral.mehta@einfochips.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Viral Mehta 16 years ago
parent
041b62374c
commit
36c7b833e5
1 changed files with 3 additions and 0 deletions
Split View Show Diff Stats
  1. 3 0
      sound/core/oss/mixer_oss.c

+ 3 - 0
sound/core/oss/mixer_oss.c
View File 

@@ -692,6 +692,9 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer,
 
 		snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PVOLUME], left, right);
 
 		if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME)
 
 			snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right);
 
+	} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CVOLUME) {
 
+		snd_mixer_oss_put_volume1_vol(fmixer, pslot,
 
+			slot->numid[SNDRV_MIXER_OSS_ITEM_CVOLUME], left, right);
 
 	} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GVOLUME) {
 
 		snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GVOLUME], left, right);
 
 	} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GLOBAL) {