From: Takashi Iwai Subject: Re: [PATCH][SOUND]volume control for CSWITCH and CROUTE Date: Tue, 07 Apr 2009 04:47:15 +0200 Message-ID: References: <49D754C4.2030803@einfochips.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 1FDF62438E for ; Tue, 7 Apr 2009 04:47:16 +0200 (CEST) In-Reply-To: <49D754C4.2030803@einfochips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Viral Mehta Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Sat, 04 Apr 2009 18:08:28 +0530, Viral Mehta wrote: > > From: Deepika Makhija > > Added an else part to check > SNDRV_MIXER_OSS_PRESENT_CVOLUME for MIC (slot 7) > in commit 36c7b833e5d2501142a371e4e75281d3a29fbd6b > > Similarly, checks and volume control is required for > SNDRV_MIXER_OSS_PRESENT_CSWITCH and SNDRV_MIXER_OSS_PRESENT_CROUTE > as well. > > Signed-off-by: Deepika Makhija > Signed-off-by: Viral Mehta Thanks, applied now to sound git tree. The original patch wasn't applicable (the file name was wrong) so I had to apply the patch manually. It'd be helpful to test the patch before submission at the next time :) Takashi > --- > --- a/sound/core/oss/mixer-oss.c 2009-04-04 17:06:46.000000000 +0530 > +++ b/sound/core/oss/mixer-oss.c 2009-04-04 17:04:33.000000000 +0530 > @@ -703,19 +703,27 @@ static int snd_mixer_oss_put_volume1(str > 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); > } >