Commit graph

20 commits

Author SHA1 Message Date
William Hubbs
938e10b66a removed a nested lock/unlock 2009-06-25 14:36:25 -05:00
William Hubbs
b8c7247feb removed acknowledge_guard and substituted queue_guard 2009-06-25 14:05:36 -05:00
William Hubbs
0bf2cae5a6 moved lock/unlock in queue_process_entry
The only time queue_process_entry should lock the queue gard is when it
is removing the item from the queue.  This happens only when the item
was successfully processed.
2009-06-25 12:06:51 -05:00
Christopher Brannon
b7f324072f Fix concurrency bugs.
1. Don't lock or unlock queue_guard during queue_clear.
It is locked when queue_clear is called, and it should remain so.
2. Protect runner_must_stop with queue_guard in
the request_espeak_stop function.
The following condition should always hold: queue_guard is locked while
testing or modifying runner_must_stop.
3. Rename stop_guard to acknowledge_guard.  This is a more
descriptive name.  This mutex simply protects the acknowledgement of
the stop request from being lost.
4. Remove the pthread_mutex_lock from the top of queue_process_entry,
because queue_guard is already locked when the function is called.
2009-06-25 11:56:20 -05:00
William Hubbs
a8cad20de8 more multithreading work
Rearranged the queue handling code so that queue.c is generic.  Also
rearranged several functions in the threads.
2009-06-25 09:05:21 -05:00
Christopher Brannon
91b8960b6a Protect the stopped variable with a mutex.
An oversight.  Should have done this in the initial commit.
volatile does not imply atomic.
2009-06-21 14:36:13 -05:00
William Hubbs
0ad70b4eaa Revert "fixed stop_speech issue"
This reverts commit 1c440e5a42.
2009-06-20 19:14:42 -05:00
William Hubbs
1c440e5a42 fixed stop_speech issue
The stop_speech function needs to test the return code from
espeak_Cancel() to be sure the operation was successful before
signaling the callback to stop the audio.
2009-06-20 16:17:42 -05:00
Christopher Brannon
d373fb2aa7 An initial stab at ALSA support.
It's very raw right now.
2009-06-19 15:11:51 -05:00
William Hubbs
a1510b5e93 indentation fixes 2009-04-12 16:33:01 -05:00
William Hubbs
36b05aec41 Added support for the punctuation command from speakup 2008-10-18 16:56:47 -05:00
William Hubbs
f76d00f6af removed the callback function
This commit removes the synthcallback function since it wasn't doing
anything.  Also, it has been reported that this may be causing the
sluggishness when espeakup is asked to shut up.
Thanks to Chris Brannon for finding this.
2008-10-04 11:39:01 -05:00
William Hubbs
9b0c6a8224 fixed the volume multiplier
The volume range is actually 0-200 instead of 0-100, so the multiplier
needed to be adjusted.
2008-09-27 12:23:11 -05:00
William Hubbs
527fb136de starting work toward supporting changing voices
This commit adds a set_voice() function which will ultimately allow the
user to switch voices.
2008-09-27 10:52:24 -05:00
William Hubbs
5ddeb1e978 indentation fixes 2008-09-01 12:50:16 -05:00
William Hubbs
ccc9c4aa4e modified rate offset
This commit moves the rate offset to 84 instead of 80 so that the
highest espeak rate can be reached by setting the speakup rate to
the maximum.
2008-08-31 11:30:01 -05:00
William Hubbs
02e72bda39 adjusted the rate multiplier
This gets us closer to espeak's top speed, which is 390 wpm.
2008-08-30 16:54:10 -05:00
William Hubbs
3e7e5be2b7 fixed bug with volume setting
Now the volume setting should be announced again.
2008-08-17 00:49:46 -05:00
William Hubbs
655894ee2a added queueing support
I have added queueing support so that when we read from the softsynth we
can put the text and commands we have read into a queue.  This will
allow us to retry calling espeak_synth() if we fill espeak's internal
buffer.
2008-08-16 19:48:40 -05:00
William Hubbs
029dd03251 modularize the code
This commit just re-arranges the source so that it is easier to work with.
2008-08-15 00:11:48 -05:00