diff options
-rw-r--r-- | ThirdPartyProject.prop | 9 | ||||
-rw-r--r-- | audio/AudioIn/UNIX/src/audioinwrapper.cpp | 3 | ||||
-rw-r--r-- | srec_jni/android_speech_srec_MicrophoneInputStream.cpp | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop deleted file mode 100644 index 87ba716..0000000 --- a/ThirdPartyProject.prop +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2010 Google Inc. All Rights Reserved. -#Fri Jul 16 10:03:09 PDT 2010 -currentVersion=Unknown -version=rc3 -isNative=true -name=srec -keywords=srec -onDevice=true -homepage=http\://source.android.com/ diff --git a/audio/AudioIn/UNIX/src/audioinwrapper.cpp b/audio/AudioIn/UNIX/src/audioinwrapper.cpp index 2fe6206..a30c017 100644 --- a/audio/AudioIn/UNIX/src/audioinwrapper.cpp +++ b/audio/AudioIn/UNIX/src/audioinwrapper.cpp @@ -100,8 +100,7 @@ int AudioOpen(void) sampleRate, AUDIO_FORMAT_PCM_16_BIT, (numChannels > 1) ? AUDIO_CHANNEL_IN_STEREO : AUDIO_CHANNEL_IN_MONO, - 8*1024, - (android::AudioRecord::record_flags) 0); + 8*1024); if (!record) return -1; diff --git a/srec_jni/android_speech_srec_MicrophoneInputStream.cpp b/srec_jni/android_speech_srec_MicrophoneInputStream.cpp index e936300..1a48ab9 100644 --- a/srec_jni/android_speech_srec_MicrophoneInputStream.cpp +++ b/srec_jni/android_speech_srec_MicrophoneInputStream.cpp @@ -59,7 +59,7 @@ static JNIEXPORT jint JNICALL Java_android_speech_srec_Recognizer_AudioRecordNew android::AudioRecord* ar = new android::AudioRecord( AUDIO_SOURCE_VOICE_RECOGNITION, sampleRate, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_IN_MONO, - fifoFrames, (android::AudioRecord::record_flags) 0); + fifoFrames); if (ar == NULL) { ALOGE("Error creating AudioRecord"); } @@ -94,9 +94,7 @@ static JNIEXPORT jint JNICALL Java_android_speech_srec_Recognizer_AudioRecordRea static JNIEXPORT void JNICALL Java_android_speech_srec_Recognizer_AudioRecordStop (JNIEnv *env, jclass clazz, jint audioRecord) { - if (int rtn = ((AudioRecord*)audioRecord)->stop()) { - throwException(env, "java/io/IOException", "AudioRecord::stop failed %d", rtn); - } + ((AudioRecord*)audioRecord)->stop(); } static JNIEXPORT void JNICALL Java_android_speech_srec_Recognizer_AudioRecordDelete |