diff options
| author | Eric Laurent <elaurent@google.com> | 2012-01-17 17:35:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-17 17:35:03 -0800 |
| commit | 1be4afecb752559092654c0e9f4ca302b6d04e9c (patch) | |
| tree | 797734f3693ef5ef035837fbd75d525024fd5253 /core/jni/android_media_AudioSystem.cpp | |
| parent | d33f97f1965b34aae673585ad4734b536c3894ef (diff) | |
| parent | 9bc8358ddaa01c3490f9709991989633a6a3dd42 (diff) | |
| download | frameworks_base-1be4afecb752559092654c0e9f4ca302b6d04e9c.zip frameworks_base-1be4afecb752559092654c0e9f4ca302b6d04e9c.tar.gz frameworks_base-1be4afecb752559092654c0e9f4ca302b6d04e9c.tar.bz2 | |
Merge "audio framework: manage stream volume per device"
Diffstat (limited to 'core/jni/android_media_AudioSystem.cpp')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index d0b5ade..8341e4c 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -183,16 +183,29 @@ android_media_AudioSystem_initStreamVolume(JNIEnv *env, jobject thiz, jint strea } static int -android_media_AudioSystem_setStreamVolumeIndex(JNIEnv *env, jobject thiz, jint stream, jint index) +android_media_AudioSystem_setStreamVolumeIndex(JNIEnv *env, + jobject thiz, + jint stream, + jint index, + jint device) { - return check_AudioSystem_Command(AudioSystem::setStreamVolumeIndex(static_cast <audio_stream_type_t>(stream), index)); + return check_AudioSystem_Command( + AudioSystem::setStreamVolumeIndex(static_cast <audio_stream_type_t>(stream), + index, + (audio_devices_t)device)); } static int -android_media_AudioSystem_getStreamVolumeIndex(JNIEnv *env, jobject thiz, jint stream) +android_media_AudioSystem_getStreamVolumeIndex(JNIEnv *env, + jobject thiz, + jint stream, + jint device) { int index; - if (AudioSystem::getStreamVolumeIndex(static_cast <audio_stream_type_t>(stream), &index) != NO_ERROR) { + if (AudioSystem::getStreamVolumeIndex(static_cast <audio_stream_type_t>(stream), + &index, + (audio_devices_t)device) + != NO_ERROR) { index = -1; } return index; @@ -219,8 +232,8 @@ static JNINativeMethod gMethods[] = { {"setForceUse", "(II)I", (void *)android_media_AudioSystem_setForceUse}, {"getForceUse", "(I)I", (void *)android_media_AudioSystem_getForceUse}, {"initStreamVolume", "(III)I", (void *)android_media_AudioSystem_initStreamVolume}, - {"setStreamVolumeIndex","(II)I", (void *)android_media_AudioSystem_setStreamVolumeIndex}, - {"getStreamVolumeIndex","(I)I", (void *)android_media_AudioSystem_getStreamVolumeIndex}, + {"setStreamVolumeIndex","(III)I", (void *)android_media_AudioSystem_setStreamVolumeIndex}, + {"getStreamVolumeIndex","(II)I", (void *)android_media_AudioSystem_getStreamVolumeIndex}, {"getDevicesForStream", "(I)I", (void *)android_media_AudioSystem_getDevicesForStream}, }; |