diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-09-26 08:51:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 08:51:33 -0700 |
| commit | 2832136bb6fcace61ef078051e94aa0a841aac15 (patch) | |
| tree | 0315560055c6aebf1740a3955a847815a9eca484 /core | |
| parent | 72a374705d32cf715443aa203f75c159e1bc9bd5 (diff) | |
| parent | c6c4365ddb0213c548b055f257dc8077389224fb (diff) | |
| download | frameworks_base-2832136bb6fcace61ef078051e94aa0a841aac15.zip frameworks_base-2832136bb6fcace61ef078051e94aa0a841aac15.tar.gz frameworks_base-2832136bb6fcace61ef078051e94aa0a841aac15.tar.bz2 | |
Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index f522a9a..56db116 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -242,6 +242,18 @@ android_media_AudioSystem_getDevicesForStream(JNIEnv *env, jobject thiz, jint st return (jint) AudioSystem::getDevicesForStream(static_cast <audio_stream_type_t>(stream)); } +static jint +android_media_AudioSystem_getPrimaryOutputSamplingRate(JNIEnv *env, jobject clazz) +{ + return (jint) AudioSystem::getPrimaryOutputSamplingRate(); +} + +static jint +android_media_AudioSystem_getPrimaryOutputFrameCount(JNIEnv *env, jobject clazz) +{ + return (jint) AudioSystem::getPrimaryOutputFrameCount(); +} + // ---------------------------------------------------------------------------- static JNINativeMethod gMethods[] = { @@ -263,6 +275,8 @@ static JNINativeMethod gMethods[] = { {"setMasterMute", "(Z)I", (void *)android_media_AudioSystem_setMasterMute}, {"getMasterMute", "()Z", (void *)android_media_AudioSystem_getMasterMute}, {"getDevicesForStream", "(I)I", (void *)android_media_AudioSystem_getDevicesForStream}, + {"getPrimaryOutputSamplingRate", "()I", (void *)android_media_AudioSystem_getPrimaryOutputSamplingRate}, + {"getPrimaryOutputFrameCount", "()I", (void *)android_media_AudioSystem_getPrimaryOutputFrameCount}, }; int register_android_media_AudioSystem(JNIEnv *env) |