diff options
| author | jkoan <jkoan@gmx.de> | 2019-04-05 11:54:01 +0200 |
|---|---|---|
| committer | jkoan <jkoan@gmx.de> | 2019-04-05 11:54:01 +0200 |
| commit | 50cbe8d6eda31349467cd5c3b74e9c1c5011ddf4 (patch) | |
| tree | 2142821f25163523d98bce45ea8c03a79fbf0674 | |
| parent | a2e7f47bedc21b611410d29e87393b9f89c391a5 (diff) | |
| parent | 7bba198ae2fd42f6092de74a64b9d544dc10e4ff (diff) | |
| download | navit-50cbe8d6eda31349467cd5c3b74e9c1c5011ddf4.tar.gz | |
Merge branch 'trunk' of https://github.com/navit-gps/navit into ide_fix_for_not_found
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | navit/speech/android/speech_android.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index c92119e4c..e190d8e44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -220,7 +220,7 @@ jobs: command: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts - add_ssh_keys: fingerprints: - - "16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48" + - "58:42:73:90:cc:68:f7:34:7e:37:37:fa:b3:26:1f:a5" - run: name: Update results to Github command: export GIT_TERMINAL_PROMPT=0 && git push origin $CIRCLE_SHA1:refs/heads/master diff --git a/navit/speech/android/speech_android.c b/navit/speech/android/speech_android.c index b76c2c3e9..fb0574166 100644 --- a/navit/speech/android/speech_android.c +++ b/navit/speech/android/speech_android.c @@ -36,7 +36,14 @@ struct speech_priv { static int speech_android_say(struct speech_priv *this, const char *text) { char *str=g_strdup(text); jstring string; - int i; + char *tok = str; + + /* Replace hyphens with white spaces, or some Android speech SDK will pronounce "hyphen" */ + while (*tok) { + if (*tok=='-') + *tok=' '; + tok++; + } string = (*jnienv)->NewStringUTF(jnienv, str); dbg(lvl_debug,"enter %s",str); |