volume control for CSWITCH and CROUTE
PATCH 1/1 volume control for CSWITCH and CROUTE
From: Deepika Makhija <[email protected]>
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.
---
sound/core/oss/mixer-oss.c +8 -0
@@ -703,19 +703,27 @@ static int snd_mixer_oss_put_volume1(strif (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 ); }
Takashi Iwai
AppliedAt Sat, 04 Apr 2009 18:08:28 +0530,
Quoted 7 lines · Viral Mehta
From: Deepika Makhija <[email protected]>
Added an else part to check
SNDRV_MIXER_OSS_PRESENT_CVOLUMEfor MIC (slot 7) in commit36c7b833e5d2501142a371e4e75281d3a29fbd6b
Quoted 6 lines
Similarly, checks and volume control is required for
SNDRV_MIXER_OSS_PRESENT_CSWITCHandSNDRV_MIXER_OSS_PRESENT_CROUTEas well.Signed-off-by Deepika Makhija <[email protected]>Signed-off-by Viral Mehta <[email protected]>
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
Quoted 32 lines
---
sound/core/oss/mixer-oss.c +8
-0@@ -703,19 +703,27 @@ static int snd_mixer_oss_put_volume1(strif (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 ); }
Quoted 17 lines · Takashi Iwai
At Sat, 04 Apr 2009 18:08:28 +0530,
Quoted 6 lines · Viral Mehta
From: Deepika Makhija <[email protected]>
Added an else part to check
SNDRV_MIXER_OSS_PRESENT_CVOLUMEfor MIC (slot 7) in commit36c7b833e5d2501142a371e4e75281d3a29fbd6bQuoted 7 lines
Similarly, checks and volume control is required for
SNDRV_MIXER_OSS_PRESENT_CSWITCHandSNDRV_MIXER_OSS_PRESENT_CROUTEas well.Signed-off-by Deepika Makhija <[email protected]>Signed-off-by Viral Mehta <[email protected]>
Quoted 9 lines
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
Thanks for taking care. I am sorry about that mistake. Yeah, lately I have learned using checkpatch.pl and things which are helpful before patch submission.
Thanks again,
Viral