summaryrefslogtreecommitdiff
path: root/navit/speech
diff options
context:
space:
mode:
authorStefan Wildemann <metalstrolch@users.noreply.github.com>2018-07-15 09:23:16 +0200
committerjkoan <jkoan@users.noreply.github.com>2018-07-15 09:23:16 +0200
commitdc8f7f1b182450ed017d0262872820cc26f08dc9 (patch)
tree2e28972c68da377f056b774a6126254a3617cb7c /navit/speech
parent380fe30a6b5d0c9212d84f7adb15e30ef5ca8ffa (diff)
downloadnavit-dc8f7f1b182450ed017d0262872820cc26f08dc9.tar.gz
update in-tree espeak to espeak-1.48.04 (#624)
* update in-tree espeak to espeak-1.48.04 Update the C-ified version of espeak to espeak-1.48.04. Currently builds and links for Sailfish. Untested for Windows builds yet. Throws a lot of warnings still. * Make private functions static in espeak. Convert the obviously private functions to static in order to fix warnings. There are a lot not so obvious left that are used in other files by extern statement. Silly. * correctly assign exported methods to headers This asigns exported functions to headers avoiding missing prototypes warning. * move vars out of for loop as Sailfish disallows c99 Standard build under Sailfosh disallows c99 features. Therefore move variables out of for loop declaration. * espeak prepare for Windows build * fix:speech:espeak Adapt to newer espeak version 1.48.04 * redo. removing the files from build was the false way * Disable mbrola support as this fails on windows * remove uneccesary posix calls on windows
Diffstat (limited to 'navit/speech')
-rw-r--r--navit/speech/espeak/speak.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/navit/speech/espeak/speak.c b/navit/speech/espeak/speak.c
index 9ac7248b1..1aebcf318 100644
--- a/navit/speech/espeak/speak.c
+++ b/navit/speech/espeak/speak.c
@@ -68,7 +68,7 @@ int GetFileLength(const char *filename) {
return(statbuf.st_size);
}
-void MarkerEvent(int type, unsigned int char_position, int value, unsigned char *out_ptr) {
+void MarkerEvent(int type, unsigned int char_position, int value, int value2, unsigned char *out_ptr){
}
char *Alloc(int size) {
@@ -151,7 +151,7 @@ static BOOL initialise(void) {
int result;
WavegenInit(22050,0); // 22050
- if((result = LoadPhData()) != 1) {
+ if((result = LoadPhData(NULL)) != 1) {
if(result == -1) {
dbg(lvl_error, "Failed to load espeak-data");
return FALSE;
@@ -159,7 +159,7 @@ static BOOL initialise(void) {
dbg(lvl_error, "Wrong version of espeak-data 0x%x (expects 0x%x) at %s",result,version_phdata,path_home);
}
LoadConfig();
- SetVoiceStack(NULL);
+ SetVoiceStack(NULL, "");
SynthesizeInit();
for(param=0; param<N_SPEECH_PARAM; param++)