X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=20904d2b0845f6de6723144bfb6bf2dca3ac23b9;hp=7d6a8044d2a3d1c0598473af64e5957629aa47bf;hb=b635cb26ba54c8f5c6a958e0ab0bc4d34d33b635;hpb=519887571cee2840024c5c8f4b7f0e5c352d3323

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 7d6a8044..20904d2b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -32,8 +32,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeech.OnInitListener;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -93,8 +91,7 @@ public class AltosDroid extends Activity {
 	private BluetoothAdapter mBluetoothAdapter = null;
 
 	// Text to Speech
-	private TextToSpeech tts    = null;
-	private boolean tts_enabled = false;
+	private AltosVoice mAltosVoice = null;
 
 	// The Handler that gets information back from the Telemetry Service
 	static class IncomingHandler extends Handler {
@@ -114,6 +111,7 @@ public class AltosDroid extends Activity {
 					ad.mTitle.setText(R.string.title_connected_to);
 					ad.mTitle.append(str);
 					Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
+					ad.mAltosVoice.speak("Connected");
 					//TEST!
 					ad.mTextView.setText(Dumper.dump(ad.mConfigData));
 					break;
@@ -198,6 +196,8 @@ public class AltosDroid extends Activity {
 			mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
 		mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
 		mLongitudeView.setText(pos(state.gps.lon, "W", "E"));
+
+		mAltosVoice.tell(state);
 	}
 
 	String pos(double p, String pos, String neg) {
@@ -216,6 +216,16 @@ public class AltosDroid extends Activity {
 		super.onCreate(savedInstanceState);
 		if(D) Log.e(TAG, "+++ ON CREATE +++");
 
+		// Get local Bluetooth adapter
+		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+
+		// If the adapter is null, then Bluetooth is not supported
+		if (mBluetoothAdapter == null) {
+			Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
+			finish();
+			return;
+		}
+
 		// Set up the window layout
 		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
 		//setContentView(R.layout.main);
@@ -247,24 +257,7 @@ public class AltosDroid extends Activity {
 		mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
 		mLongitudeView = (TextView) findViewById(R.id.longitude_value);
 
-		// Get local Bluetooth adapter
-		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-		// If the adapter is null, then Bluetooth is not supported
-		if (mBluetoothAdapter == null) {
-			Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
-			finish();
-			return;
-		}
-
-		// Enable Text to Speech
-		tts = new TextToSpeech(this, new OnInitListener() {
-			public void onInit(int status) {
-				if (status == TextToSpeech.SUCCESS) tts_enabled = true;
-				if (tts_enabled) tts.speak("AltosDroid ready", TextToSpeech.QUEUE_ADD, null );
-			}
-		});
-
+		mAltosVoice = new AltosVoice(this);
 	}
 
 	@Override
@@ -308,7 +301,7 @@ public class AltosDroid extends Activity {
 		super.onDestroy();
 		if(D) Log.e(TAG, "--- ON DESTROY ---");
 
-		if (tts != null) tts.shutdown();
+		mAltosVoice.stop();
 	}