summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--navit/android/src/org/navitproject/navit/NavitSpeech.java14
-rw-r--r--navit/speech/android/Makefile.am3
2 files changed, 14 insertions, 3 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitSpeech.java b/navit/android/src/org/navitproject/navit/NavitSpeech.java
index dbe40bb0..71b0314e 100644
--- a/navit/android/src/org/navitproject/navit/NavitSpeech.java
+++ b/navit/android/src/org/navitproject/navit/NavitSpeech.java
@@ -19,6 +19,7 @@
package org.navitproject.navit;
+import java.lang.Thread;
import android.app.Activity;
import android.widget.TextView;
import android.os.Bundle;
@@ -30,9 +31,12 @@ import android.util.Log;
import com.google.tts.TTS;
-public class NavitSpeech {
+public class NavitSpeech implements Runnable {
private TTS tts;
private TTS.InitListener ttsInitListener;
+ private String what;
+ private Thread thread;
+
NavitSpeech(Context context)
{
ttsInitListener = new TTS.InitListener() {
@@ -41,10 +45,16 @@ public class NavitSpeech {
};
tts=new TTS(context, ttsInitListener, true);
}
- public void say(String what)
+ public void run()
{
Log.e("NavitSpeech","In "+what);
tts.speak(what, 0, null);
}
+ public void say(String what)
+ {
+ this.what=what;
+ thread = new Thread(this, "speech thread");
+ thread.start();
+ }
}
diff --git a/navit/speech/android/Makefile.am b/navit/speech/android/Makefile.am
index f8573fb1..c2a0dc35 100644
--- a/navit/speech/android/Makefile.am
+++ b/navit/speech/android/Makefile.am
@@ -6,7 +6,8 @@ else
noinst_LTLIBRARIES = libspeech_android.la
endif
libspeech_android_la_SOURCES = speech_android.c
-libspeech_android_la_LDFLAGS = -module -avoid-version -Xcompiler -nostdlib
+libspeech_android_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@
+
android: libspeech_android.la
mkdir -p ../../android/libs/armeabi/navit/speech