Commit 3f132e02 authored by Samuel Thibault's avatar Samuel Thibault Committed by Greg Kroah-Hartman
Browse files

speakup: Notify synthesizers of the punctuation level change 



Even if speakup does the filtering itself, it does not filter out A_PUNC
characters (because these are needed e.g. for prosody), so we have to tell
synthesizers whether they should filter them out or not.

Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Link: https://lore.kernel.org/r/20220823222515.412752202@ens-lyon.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73392920

drivers/accessibility/speakup/speakup_soft.c

+24 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
static int softsynth_probe(struct spk_synth *synth);

static void softsynth_release(struct spk_synth *synth);

static int softsynth_is_alive(struct spk_synth *synth);

static int softsynth_adjust(struct spk_synth *synth, struct st_var_header *var);

static unsigned char get_index(struct spk_synth *synth);



static struct miscdevice synth_device, synthu_device;
@@ -41,7 +42,7 @@ static struct var_t vars[] = { 
	{ INFLECTION, .u.n = {"\x01%dr", 5, 0, 9, 0, 0, NULL } },

	{ VOL, .u.n = {"\x01%dv", 5, 0, 9, 0, 0, NULL } },

	{ TONE, .u.n = {"\x01%dx", 1, 0, 2, 0, 0, NULL } },

	{ PUNCT, .u.n = {"\x01%db", 0, 0, 2, 0, 0, NULL } },

	{ PUNCT, .u.n = {"\x01%db", 0, 0, 3, 0, 0, NULL } },

	{ VOICE, .u.n = {"\x01%do", 0, 0, 7, 0, 0, NULL } },

	{ FREQUENCY, .u.n = {"\x01%df", 5, 0, 9, 0, 0, NULL } },

	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
@@ -133,7 +134,7 @@ static struct spk_synth synth_soft = { 
	.catch_up = NULL,

	.flush = NULL,

	.is_alive = softsynth_is_alive,

	.synth_adjust = NULL,

	.synth_adjust = softsynth_adjust,

	.read_buff_add = NULL,

	.get_index = get_index,

	.indexing = {
@@ -426,6 +427,27 @@ static int softsynth_is_alive(struct spk_synth *synth) 
	return 0;

}



static int softsynth_adjust(struct spk_synth *synth, struct st_var_header *var)

{

	struct st_var_header *punc_level_var;

	struct var_t *var_data;



	if (var->var_id != PUNC_LEVEL)

		return 0;



	/* We want to set the the speech synthesis punctuation level

	 * accordingly, so it properly tunes speaking A_PUNC characters */

	var_data = var->data;

	if (!var_data)

		return 0;

	punc_level_var = spk_get_var_header(PUNCT);

	if (!punc_level_var)

		return 0;

	spk_set_num_var(var_data->u.n.value, punc_level_var, E_SET);



	return 1;

}



module_param_named(start, synth_soft.startup, short, 0444);



MODULE_PARM_DESC(start, "Start the synthesizer once it is loaded.");

drivers/accessibility/speakup/spk_types.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct spk_synth { 
	void (*catch_up)(struct spk_synth *synth);

	void (*flush)(struct spk_synth *synth);

	int (*is_alive)(struct spk_synth *synth);

	int (*synth_adjust)(struct st_var_header *var);

	int (*synth_adjust)(struct spk_synth *synth, struct st_var_header *var);

	void (*read_buff_add)(u_char c);

	unsigned char (*get_index)(struct spk_synth *synth);

	struct synth_indexing indexing;

drivers/accessibility/speakup/varhandlers.c

+8 −4
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct st_var_header *spk_get_var_header(enum var_id_t var_id) 
		return NULL;

	return p_header;

}

EXPORT_SYMBOL_GPL(spk_get_var_header);



struct st_var_header *spk_var_header_by_name(const char *name)

{
@@ -221,15 +222,17 @@ int spk_set_num_var(int input, struct st_var_header *var, int how) 
		*p_val = val;

	if (var->var_id == PUNC_LEVEL) {

		spk_punc_mask = spk_punc_masks[val];

		return 0;

	}

	if (var_data->u.n.multiplier != 0)

		val *= var_data->u.n.multiplier;

	val += var_data->u.n.offset;

	if (var->var_id < FIRST_SYNTH_VAR || !synth)



	if (!synth)

		return 0;

	if (synth->synth_adjust && synth->synth_adjust(synth, var))

		return 0;

	if (var->var_id < FIRST_SYNTH_VAR)

		return 0;

	if (synth->synth_adjust)

		return synth->synth_adjust(var);



	if (!var_data->u.n.synth_fmt)

		return 0;
@@ -245,6 +248,7 @@ int spk_set_num_var(int input, struct st_var_header *var, int how) 
	synth_printf("%s", cp);

	return 0;

}

EXPORT_SYMBOL_GPL(spk_set_num_var);



int spk_set_string_var(const char *page, struct st_var_header *var, int len)

{