X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosVoice.java;h=ac13ee14e81176c69d46587392340c3a8018ba62;hp=e4ea99a2220d80a8abbe3a83a602486a7a45f236;hb=7ef3ad0c9354c0484c25badc69334b59c7f355e2;hpb=e9153c4f2c71ed965822fcfe5112d2bc38506baf

diff --git a/ao-tools/altosui/AltosVoice.java b/ao-tools/altosui/AltosVoice.java
index e4ea99a2..ac13ee14 100644
--- a/ao-tools/altosui/AltosVoice.java
+++ b/ao-tools/altosui/AltosVoice.java
@@ -27,6 +27,7 @@ public class AltosVoice implements Runnable {
 	Voice				voice;
 	LinkedBlockingQueue<String>	phrases;
 	Thread				thread;
+	boolean				busy;
 
 	final static String voice_name = "kevin16";
 
@@ -35,19 +36,45 @@ public class AltosVoice implements Runnable {
 			for (;;) {
 				String s = phrases.take();
 				voice.speak(s);
+				synchronized(this) {
+					if (phrases.isEmpty()) {
+						busy = false;
+						notifyAll();
+					}
+				}
 			}
 		} catch (InterruptedException e) {
 		}
 	}
-	public void speak(String s) {
+
+	public synchronized void drain() throws InterruptedException {
+		while (busy)
+			wait();
+	}
+
+	public void speak_always(String s) {
 		try {
-			if (voice != null)
-				phrases.put(s);
+			if (voice != null) {
+				synchronized(this) {
+					busy = true;
+					phrases.put(s);
+				}
+			}
 		} catch (InterruptedException e) {
 		}
 	}
 
+	public void speak(String s) {
+		if (AltosPreferences.voice())
+			speak_always(s);
+	}
+
+	public void speak(String format, Object... parameters) {
+		speak(String.format(format, parameters));
+	}
+
 	public AltosVoice () {
+		busy = false;
 		voice_manager = VoiceManager.getInstance();
 		voice = voice_manager.getVoice(voice_name);
 		if (voice != null) {
@@ -55,7 +82,6 @@ public class AltosVoice implements Runnable {
 			phrases = new LinkedBlockingQueue<String> ();
 			thread = new Thread(this);
 			thread.start();
-			speak("Rocket Flight Monitor Ready");
 		} else {
 			System.out.printf("Voice manager failed to open %s\n", voice_name);
 			Voice[] voices = voice_manager.getVoices();