]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
staging: speakup_soft: Fix alternate speech with other synths
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Thu, 7 Mar 2019 22:06:57 +0000 (23:06 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Aug 2019 11:38:42 +0000 (12:38 +0100)
commit2dc2961f8efc6d013e88cc42244afc0ff558a2b4
treecf66f00a025d1a56f7cb8199177a483d93ac33d7
parent507ed215f534a30043dac35a08ccf137166d6020
staging: speakup_soft: Fix alternate speech with other synths

commit 45ac7b31bc6c4af885cc5b5d6c534c15bcbe7643 upstream.

When switching from speakup_soft to another synth, speakup_soft would
keep calling synth_buffer_getc() from softsynthx_read.

Let's thus make synth.c export the knowledge of the current synth, so
that speakup_soft can determine whether it should be running.

speakup_soft also needs to set itself alive, otherwise the switch would
let it remain silent.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.16:
 - There's no Unicode support
 - Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/staging/speakup/speakup_soft.c
drivers/staging/speakup/spk_priv.h
drivers/staging/speakup/synth.c