diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index b148d86d..fdb964f4 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -127,8 +127,8 @@ + android:name="com.reecedunn.espeak.providers.SettingsProvider" + android:authorities="com.reecedunn.espeak.providers.SettingsProvider" /> diff --git a/android/jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp b/android/jni/jni/eSpeakService.cpp similarity index 90% rename from android/jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp rename to android/jni/jni/eSpeakService.cpp index 6e190c4f..a36d68a3 100644 --- a/android/jni/jni/com_googlecode_eyesfree_espeak_eSpeakService.cpp +++ b/android/jni/jni/eSpeakService.cpp @@ -116,7 +116,7 @@ JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeClassInit( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeClassInit( JNIEnv* env, jclass clazz) { if (DEBUG) LOGV("%s", __FUNCTION__); METHOD_nativeSynthCallback = env->GetMethodID(clazz, "nativeSynthCallback", "([B)V"); @@ -126,7 +126,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeClassInit( } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeCreate( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeCreate( JNIEnv *env, jobject object, jstring path) { if (DEBUG) LOGV("%s", __FUNCTION__); native_data_t *nat = new native_data_t; @@ -150,7 +150,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeCreate( } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeDestroy( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeDestroy( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); native_data_t *nat = getNativeData(env, object); @@ -163,7 +163,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeDestroy( } JNIEXPORT jint -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetSampleRate( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeGetSampleRate( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); const native_data_t *nat = getNativeData(env, object); @@ -171,7 +171,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetSampleRate( } JNIEXPORT jint -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetChannelCount( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeGetChannelCount( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); const native_data_t *nat = getNativeData(env, object); @@ -179,7 +179,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetChannelCoun } JNIEXPORT jint -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetAudioFormat( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeGetAudioFormat( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); const native_data_t *nat = getNativeData(env, object); @@ -187,7 +187,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetAudioFormat } JNIEXPORT jint -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetBufferSizeInMillis( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeGetBufferSizeInMillis( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); const native_data_t *nat = getNativeData(env, object); @@ -195,7 +195,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetBufferSizeI } JNIEXPORT jobjectArray -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetAvailableVoices( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeGetAvailableVoices( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); @@ -235,7 +235,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeGetAvailableVo } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetVoiceByProperties( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeSetVoiceByProperties( JNIEnv *env, jobject object, jstring name, jstring languages, jint gender, jint age, jint variant) { const char *c_name = name ? env->GetStringUTFChars(name, NULL) : NULL; @@ -268,7 +268,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetVoiceByProp } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetRate( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeSetRate( JNIEnv *env, jobject object, jint rate) { const int wpm = ((float)rate / 100) * espeak_GetParameter(espeakRATE, 0); if (DEBUG) LOGV("%s(rate=%d, wpm=%d)", __FUNCTION__, rate, wpm); @@ -286,7 +286,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetRate( } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetPitch( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeSetPitch( JNIEnv *env, jobject object, jint pitch) { // The values of pitch from android range from 50 - 200, with 100 being normal. // The values espeak supports are from 0 - 100, with 50 being normal. @@ -306,7 +306,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSetPitch( } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSynthesize( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeSynthesize( JNIEnv *env, jobject object, jstring text) { if (DEBUG) LOGV("%s", __FUNCTION__); native_data_t *nat = getNativeData(env, object); @@ -335,7 +335,7 @@ JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeSynthesize( } JNIEXPORT jboolean -JNICALL Java_com_googlecode_eyesfree_espeak_SpeechSynthesis_nativeStop( +JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeStop( JNIEnv *env, jobject object) { if (DEBUG) LOGV("%s", __FUNCTION__); espeak_Cancel(); diff --git a/android/jni/jni/com_google_espeakengine.cpp b/android/jni/jni/espeakengine.cpp similarity index 100% rename from android/jni/jni/com_google_espeakengine.cpp rename to android/jni/jni/espeakengine.cpp diff --git a/android/res/xml/tts_engine.xml b/android/res/xml/tts_engine.xml index 7da882a1..5307b4a9 100644 --- a/android/res/xml/tts_engine.xml +++ b/android/res/xml/tts_engine.xml @@ -1,4 +1,4 @@ \ No newline at end of file + android:settingsActivity="com.reecedunn.espeak.TtsSettingsActivity" /> \ No newline at end of file diff --git a/android/src/com/googlecode/eyesfree/espeak/CheckVoiceData.java b/android/src/com/reecedunn/espeak/CheckVoiceData.java similarity index 96% rename from android/src/com/googlecode/eyesfree/espeak/CheckVoiceData.java rename to android/src/com/reecedunn/espeak/CheckVoiceData.java index 4ebe4a4c..d27b1ab3 100755 --- a/android/src/com/googlecode/eyesfree/espeak/CheckVoiceData.java +++ b/android/src/com/reecedunn/espeak/CheckVoiceData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.app.Activity; import android.content.Context; @@ -24,8 +24,8 @@ import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.Engine; import android.util.Log; -import com.googlecode.eyesfree.espeak.SpeechSynthesis.SynthReadyCallback; -import com.googlecode.eyesfree.espeak.SpeechSynthesis.Voice; +import com.reecedunn.espeak.SpeechSynthesis.SynthReadyCallback; +import com.reecedunn.espeak.SpeechSynthesis.Voice; import java.io.File; import java.util.ArrayList; diff --git a/android/src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java b/android/src/com/reecedunn/espeak/DownloadVoiceData.java similarity index 98% rename from android/src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java rename to android/src/com/reecedunn/espeak/DownloadVoiceData.java index 38eefe94..5ebf6c93 100755 --- a/android/src/com/googlecode/eyesfree/espeak/DownloadVoiceData.java +++ b/android/src/com/reecedunn/espeak/DownloadVoiceData.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project + * Copyright (C) 2012 Reece H. Dunn * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +15,7 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.app.Activity; import android.content.Context; @@ -33,7 +34,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; public class DownloadVoiceData extends Activity { - public static final String BROADCAST_LANGUAGES_UPDATED = "com.googlecode.eyesfree.espeak.LANGUAGES_UPDATED"; + public static final String BROADCAST_LANGUAGES_UPDATED = "com.reecedunn.espeak.LANGUAGES_UPDATED"; private AsyncExtract mAsyncExtract; diff --git a/android/src/com/googlecode/eyesfree/espeak/GetSampleText.java b/android/src/com/reecedunn/espeak/GetSampleText.java similarity index 99% rename from android/src/com/googlecode/eyesfree/espeak/GetSampleText.java rename to android/src/com/reecedunn/espeak/GetSampleText.java index 8389eaed..48a191c8 100755 --- a/android/src/com/googlecode/eyesfree/espeak/GetSampleText.java +++ b/android/src/com/reecedunn/espeak/GetSampleText.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.app.Activity; import android.content.Intent; diff --git a/android/src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java b/android/src/com/reecedunn/espeak/SpeechSynthesis.java similarity index 99% rename from android/src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java rename to android/src/com/reecedunn/espeak/SpeechSynthesis.java index f127953a..ced93dc7 100644 --- a/android/src/com/googlecode/eyesfree/espeak/SpeechSynthesis.java +++ b/android/src/com/reecedunn/espeak/SpeechSynthesis.java @@ -21,7 +21,7 @@ * API Version: 14 */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.content.Context; import android.speech.tts.TextToSpeech; diff --git a/android/src/com/googlecode/eyesfree/espeak/TtsService.java b/android/src/com/reecedunn/espeak/TtsService.java similarity index 98% rename from android/src/com/googlecode/eyesfree/espeak/TtsService.java rename to android/src/com/reecedunn/espeak/TtsService.java index 3d446dcb..5b3737a2 100644 --- a/android/src/com/googlecode/eyesfree/espeak/TtsService.java +++ b/android/src/com/reecedunn/espeak/TtsService.java @@ -22,7 +22,7 @@ * API Version: 14 */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -39,8 +39,8 @@ import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeechService; import android.util.Log; -import com.googlecode.eyesfree.espeak.SpeechSynthesis.SynthReadyCallback; -import com.googlecode.eyesfree.espeak.SpeechSynthesis.Voice; +import com.reecedunn.espeak.SpeechSynthesis.SynthReadyCallback; +import com.reecedunn.espeak.SpeechSynthesis.Voice; import java.util.List; import java.util.Locale; diff --git a/android/src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java b/android/src/com/reecedunn/espeak/TtsSettingsActivity.java similarity index 98% rename from android/src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java rename to android/src/com/reecedunn/espeak/TtsSettingsActivity.java index c11e7007..e85a77b1 100644 --- a/android/src/com/googlecode/eyesfree/espeak/TtsSettingsActivity.java +++ b/android/src/com/reecedunn/espeak/TtsSettingsActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.os.Bundle; import android.preference.ListPreference; diff --git a/android/src/com/googlecode/eyesfree/espeak/eSpeak.java b/android/src/com/reecedunn/espeak/eSpeak.java similarity index 92% rename from android/src/com/googlecode/eyesfree/espeak/eSpeak.java rename to android/src/com/reecedunn/espeak/eSpeak.java index 4ae49440..e72426e8 100755 --- a/android/src/com/googlecode/eyesfree/espeak/eSpeak.java +++ b/android/src/com/reecedunn/espeak/eSpeak.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.app.Activity; import android.os.Bundle; @@ -28,7 +28,7 @@ import android.os.Bundle; * implementing TTS must be a file placed here: * /data/data//lib/libtts.so * Example: - * /data/data/com.googlecode.eyesfree.espeak/lib/libttsespeak.so + * /data/data/com.reecedunn.espeak/lib/libttsespeak.so */ public class eSpeak extends Activity { diff --git a/android/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java b/android/src/com/reecedunn/espeak/eSpeakActivity.java similarity index 99% rename from android/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java rename to android/src/com/reecedunn/espeak/eSpeakActivity.java index e11cb23c..6e1b4c50 100644 --- a/android/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java +++ b/android/src/com/reecedunn/espeak/eSpeakActivity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak; +package com.reecedunn.espeak; import android.app.Activity; import android.app.AlertDialog; diff --git a/android/src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java b/android/src/com/reecedunn/espeak/providers/SettingsProvider.java similarity index 95% rename from android/src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java rename to android/src/com/reecedunn/espeak/providers/SettingsProvider.java index 2a1b98c8..68d16adf 100644 --- a/android/src/com/googlecode/eyesfree/espeak/providers/SettingsProvider.java +++ b/android/src/com/reecedunn/espeak/providers/SettingsProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.googlecode.eyesfree.espeak.providers; +package com.reecedunn.espeak.providers; -import com.googlecode.eyesfree.espeak.CheckVoiceData; +import com.reecedunn.espeak.CheckVoiceData; import android.content.ContentProvider; import android.content.ContentValues;