Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e8e529 authored by Deepika Makhija's avatar Deepika Makhija Committed by Takashi Iwai
Browse files

ALSA: oss - volume control for CSWITCH and CROUTE 



Added an else part to check
SNDRV_MIXER_OSS_PRESENT_CVOLUME for MIC (slot 7)
in commit 36c7b833

Similarly, checks and volume control is required for
SNDRV_MIXER_OSS_PRESENT_CSWITCH and SNDRV_MIXER_OSS_PRESENT_CROUTE
as well.

Signed-off-by: default avatarDeepika Makhija <deepika.makhija@einfochips.com>
Signed-off-by: default avatarViral Mehta <viral.mehta@einfochips.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7d2ac103

sound/core/oss/mixer_oss.c

+8 −0
Original line number Diff line number Diff line
@@ -703,19 +703,27 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer, 
	if (left || right) {

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_PSWITCH)

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PSWITCH], left, right, 0);

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_CSWITCH)

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CSWITCH], left, right, 0);

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_GSWITCH)

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GSWITCH], left, right, 0);

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_PROUTE)

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PROUTE], left, right, 1);

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_CROUTE)

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CROUTE], left, right, 1);

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_GROUTE)

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GROUTE], left, right, 1);

	} else {

		if (slot->present & SNDRV_MIXER_OSS_PRESENT_PSWITCH) {

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PSWITCH], left, right, 0);

		} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CSWITCH) {

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CSWITCH], left, right, 0);

		} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GSWITCH) {

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GSWITCH], left, right, 0);

		} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_PROUTE) {

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PROUTE], left, right, 1);

		} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_CROUTE) {

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CROUTE], left, right, 1);

		} else if (slot->present & SNDRV_MIXER_OSS_PRESENT_GROUTE) {

			snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_GROUTE], left, right, 1);

		}