diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 19:34:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 19:34:31 +0000 |
| commit | 2a535d755db5c365041625cfda4e533c93899d60 (patch) | |
| tree | 87e9fd2a23981a0977147518e2465bd6da76ebda /variablespeed | |
| parent | bdd65f5e49719431e35398738b81e6d9feb05eb7 (diff) | |
| parent | 9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9 (diff) | |
| download | android_frameworks_ex-2a535d755db5c365041625cfda4e533c93899d60.tar.gz android_frameworks_ex-2a535d755db5c365041625cfda4e533c93899d60.tar.bz2 android_frameworks_ex-2a535d755db5c365041625cfda4e533c93899d60.zip | |
am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"
* commit '9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9':
AArch64: Minor JNI type changes
Diffstat (limited to 'variablespeed')
| -rw-r--r-- | variablespeed/jni/jni_entry.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/variablespeed/jni/jni_entry.cc b/variablespeed/jni/jni_entry.cc index d679475..20bcf3c 100644 --- a/variablespeed/jni/jni_entry.cc +++ b/variablespeed/jni/jni_entry.cc @@ -39,7 +39,7 @@ class MethodLog { }; extern "C" { -JNI_METHOD(playFileDescriptor, void) (JNIEnv*, jclass, int fd, jlong offset, +JNI_METHOD(playFileDescriptor, void) (JNIEnv*, jclass, jint fd, jlong offset, jlong length) { MethodLog _("playFileDescriptor"); AudioEngine::GetEngine()->PlayFileDescriptor(fd, offset, length); @@ -52,7 +52,7 @@ JNI_METHOD(playUri, void) (JNIEnv* env, jclass, jstring uri) { AudioEngine::GetEngine()->PlayUri(utf8); } -JNI_METHOD(setVariableSpeed, void) (JNIEnv*, jclass, float speed) { +JNI_METHOD(setVariableSpeed, void) (JNIEnv*, jclass, jfloat speed) { MethodLog _("setVariableSpeed"); AudioEngine::GetEngine()->SetVariableSpeed(speed); } @@ -67,19 +67,19 @@ JNI_METHOD(stopPlayback, void) (JNIEnv*, jclass) { AudioEngine::GetEngine()->RequestStop(); } -JNI_METHOD(getCurrentPosition, int) (JNIEnv*, jclass) { +JNI_METHOD(getCurrentPosition, jint) (JNIEnv*, jclass) { return AudioEngine::GetEngine()->GetCurrentPosition(); } -JNI_METHOD(getTotalDuration, int) (JNIEnv*, jclass) { +JNI_METHOD(getTotalDuration, jint) (JNIEnv*, jclass) { return AudioEngine::GetEngine()->GetTotalDuration(); } JNI_METHOD(initializeEngine, void) (JNIEnv*, jclass, - int targetFrames, float windowDuration, - float windowOverlapDuration, size_t maxPlayBufferCount, - float initialRate, size_t decodeInitialSize, size_t decodeMaxSize, - size_t startPositionMillis, int audioStreamType) { + jint targetFrames, jfloat windowDuration, + jfloat windowOverlapDuration, jint maxPlayBufferCount, + jfloat initialRate, jint decodeInitialSize, jint decodeMaxSize, + jint startPositionMillis, jint audioStreamType) { MethodLog _("initializeEngine"); AudioEngine *engine = new AudioEngine(targetFrames, windowDuration, windowOverlapDuration, maxPlayBufferCount, initialRate, |