At Tue, 6 Oct 2009 16:04:11 +0200, pavel.hofman@ivitera.com wrote:

From: pavel pavel@insite.cz

• PLEASE NOTE - this change requires the corresponding update of envy24control for ice1712 - kind of an ABI change.
• The "Multi Track Peak" control is read-only level meters indicator.
• The control is VERY confusing to most users since it is currently displayed in regular mixers. E.g. alsamixer ignores its read-only status and allows changing the levels with keys which makes no sense.

Signed-off-by: Pavel Hofman pavel.hofman@ivitera.com

Applied now. Thanks.

Takashi

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 56d8d67..c7cff6f 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2269,7 +2269,7 @@ static int snd_ice1712_pro_peak_get(struct snd_kcontrol *kcontrol, }

static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {

• .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

• .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = "Multi Track Peak", .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, .info = snd_ice1712_pro_peak_info,

diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 3896fb9..28ca8a4 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -2160,7 +2160,7 @@ static int snd_vt1724_pro_peak_get(struct snd_kcontrol *kcontrol, }

static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {

• .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

• .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = "Multi Track Peak", .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, .info = snd_vt1724_pro_peak_info,

-- 1.5.4.3