ceos/espeakup
1
0
Fork 0
mirror of https://github.com/linux-speakup/espeakup.git synced 2026-08-20 23:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 445985efae into a5b655ddb0

Browse source
This commit is contained in:
Samuel Thibault 2018-06-30 13:42:22 +00:00 • committed by GitHub
commit e4bc87d1ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

40
espeak.c
View file

@ -40,6 +40,7 @@ const int rateOffset = 80;
const int volumeMultiplier = 22;
volatile int stop_requested = 0;
int paused_espeak = 1;
static int acsint_callback(short *wav, int numsamples, espeak_EVENT * events)
{
@ -211,6 +212,32 @@ static void synth_queue_clear()
}
}
static void reinitialize_espeak(struct synth_t *s)
{
int rate;
/* Re-initialize espeak */
rate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 50, NULL, 0);
if (rate < 0) {
fprintf(stderr, "Unable to initialize espeak.\n");
return;
}
/* We need a callback in acsint mode, but not in speakup mode. */
if (espeakup_mode == ESPEAKUP_MODE_ACSINT)
espeak_SetSynthCallback(acsint_callback);
/* Set parameters again */
espeak_SetVoiceByName(s->voice);
espeak_SetParameter(espeakRANGE, s->frequency * frequencyMultiplier, 0);
espeak_SetParameter(espeakPITCH, s->pitch * pitchMultiplier, 0);
espeak_SetParameter(espeakRATE, s->rate * rateMultiplier + rateOffset, 0);
espeak_SetParameter(espeakVOLUME, (s->volume + 1) * volumeMultiplier, 0);
espeak_SetParameter(espeakCAPITALS, 0, 0);
paused_espeak = 0;
return;
}
static void queue_process_entry(struct synth_t *s)
{
espeak_ERROR error;
@ -222,6 +249,11 @@ static void queue_process_entry(struct synth_t *s)
current = (struct espeak_entry_t *) queue_remove(synth_queue);
}
pthread_mutex_unlock(&queue_guard);
if (current->cmd != CMD_PAUSE && paused_espeak) {
reinitialize_espeak(s);
}
switch (current->cmd) {
case CMD_SET_FREQUENCY:
error = set_frequency(s, current->value, current->adjust);
@ -246,6 +278,13 @@ static void queue_process_entry(struct synth_t *s)
s->len = current->len;
error = speak_text(s);
break;
case CMD_PAUSE:
if (!paused_espeak) {
espeak_Cancel();
espeak_Terminate();
paused_espeak = 1;
}
break;
default:
break;
}
@ -282,6 +321,7 @@ int initialize_espeak(struct synth_t *s)
set_rate(s, defaultRate, ADJ_SET);
set_volume(s, defaultVolume, ADJ_SET);
espeak_SetParameter(espeakCAPITALS, 0, 0);
paused_espeak = 0;
return 0;
}

3
espeakup.c
View file

@ -231,7 +231,8 @@ int main(int argc, char **argv)
pthread_join(softsynth_thread_id, NULL);
pthread_join(espeak_thread_id, NULL);
espeak_Terminate();
if (!paused_espeak)
espeak_Terminate();
close_softsynth();
out:

2
espeakup.h
View file

@ -45,6 +45,7 @@ enum command_t {
CMD_SET_VOLUME,
CMD_SPEAK_TEXT,
CMD_FLUSH,
CMD_PAUSE,
CMD_UNKNOWN,
};
@ -86,6 +87,7 @@ extern void close_softsynth(void);
extern void *softsynth_thread(void *arg);
extern volatile int should_run;
extern volatile int stop_requested;
extern int paused_espeak;
extern int self_pipe_fds[2];
#define PIPE_READ_FD (self_pipe_fds[0])
#define PIPE_WRITE_FD (self_pipe_fds[1])

3
softsynth.c
View file

@ -133,6 +133,9 @@ static int process_command(struct synth_t *s, char *buf, int start)
case 'v':
cmd = CMD_SET_VOLUME;
break;
case 'P':
cmd = CMD_PAUSE;
break;
default:
cmd = CMD_UNKNOWN;
break;