summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wildemann <gta04@metalstrolche.de>2018-06-05 23:26:30 +0200
committerStefan Wildemann <gta04@metalstrolche.de>2018-06-05 23:26:30 +0200
commitffa68e1650dd9c67f885af4e2e7bb05fff6fc0d7 (patch)
tree91e7ed7a1e3773676b7a503d57533110d4484579
parent10288c04d761dd7f329503c8021d6e47e71409b7 (diff)
downloadnavit-ffa68e1650dd9c67f885af4e2e7bb05fff6fc0d7.tar.gz
fix:speech:espeak Adapt to newer espeak version 1.48.04
-rw-r--r--navit/speech/espeak/speak.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/navit/speech/espeak/speak.c b/navit/speech/espeak/speak.c
index 9ac7248b1..592caa3a0 100644
--- a/navit/speech/espeak/speak.c
+++ b/navit/speech/espeak/speak.c
@@ -68,8 +68,8 @@ 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, unsigned char *out_ptr) {
+//}
char *Alloc(int size) {
return g_malloc(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++)