提交 d7012df3 编写于 作者: S Samuel Thibault 提交者: Greg Kroah-Hartman

speakup: Fix var_id_t values and thus keymap

commit d97a9d7a ("staging/speakup: Add inflection synth parameter")
introduced a new "inflection" speakup parameter next to "pitch", but
the values of the var_id_t enum are actually used by the keymap tables
so we must not renumber them. The effect was that notably the volume
control shortcut (speakup-1 or 2) was actually changing the inflection.

This moves the INFLECTION value at the end of the var_id_t enum to
fix back the enum values. This also adds a warning about it.

Fixes: d97a9d7a ("staging/speakup: Add inflection synth parameter")
Cc: stable@vger.kernel.org
Reported-by: NKirk Reiser <kirk@reisers.ca>
Reported-by: NGregory Nowak <greg@gregn.net>
Tested-by: NGregory Nowak <greg@gregn.net>
Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
Link: https://lore.kernel.org/r/20201012160646.qmdo4eqtj24hpch4@functionSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 9d516aa8
...@@ -32,6 +32,10 @@ enum { ...@@ -32,6 +32,10 @@ enum {
E_NEW_DEFAULT, E_NEW_DEFAULT,
}; };
/*
* Note: add new members at the end, speakupmap.h depends on the values of the
* enum starting from SPELL_DELAY (see inc_dec_var)
*/
enum var_id_t { enum var_id_t {
VERSION = 0, SYNTH, SILENT, SYNTH_DIRECT, VERSION = 0, SYNTH, SILENT, SYNTH_DIRECT,
KEYMAP, CHARS, KEYMAP, CHARS,
...@@ -42,9 +46,9 @@ enum var_id_t { ...@@ -42,9 +46,9 @@ enum var_id_t {
SAY_CONTROL, SAY_WORD_CTL, NO_INTERRUPT, KEY_ECHO, SAY_CONTROL, SAY_WORD_CTL, NO_INTERRUPT, KEY_ECHO,
SPELL_DELAY, PUNC_LEVEL, READING_PUNC, SPELL_DELAY, PUNC_LEVEL, READING_PUNC,
ATTRIB_BLEEP, BLEEPS, ATTRIB_BLEEP, BLEEPS,
RATE, PITCH, INFLECTION, VOL, TONE, PUNCT, VOICE, FREQUENCY, LANG, RATE, PITCH, VOL, TONE, PUNCT, VOICE, FREQUENCY, LANG,
DIRECT, PAUSE, DIRECT, PAUSE,
CAPS_START, CAPS_STOP, CHARTAB, CAPS_START, CAPS_STOP, CHARTAB, INFLECTION,
MAXVARS MAXVARS
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册