diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-10-07 03:20:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-07 03:20:26 -0700 |
| commit | 6c904e26d4cd7a79f589e613fa7b2866a9fccb15 (patch) | |
| tree | 6af862be56e12cdec873fef7e99129a288a79c3d /services/camera | |
| parent | 3e754efaddf3e221bcae6fe836d7553185d01944 (diff) | |
| parent | 90f4bc2a3d361252df898fa31a99f4120aeefb27 (diff) | |
| download | frameworks_av-6c904e26d4cd7a79f589e613fa7b2866a9fccb15.zip frameworks_av-6c904e26d4cd7a79f589e613fa7b2866a9fccb15.tar.gz frameworks_av-6c904e26d4cd7a79f589e613fa7b2866a9fccb15.tar.bz2 | |
Merge "Allow shutter/recording sound to be adjusted unless it's forced."
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 9f7bd27..05e7bcf 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -278,9 +278,20 @@ void CameraService::setCameraFree(int cameraId) { // media players. static MediaPlayer* newMediaPlayer(const char *file) { + // Read the system property to determine if we have need to use the + // AUDIO_STREAM_ENFORCED_AUDIBLE type. + char value[PROPERTY_VALUE_MAX]; + property_get("ro.camera.sound.forced", value, "0"); + int audioStreamType; + if (strcmp(value, "0") != 0) { + audioStreamType = AUDIO_STREAM_ENFORCED_AUDIBLE; + } else { + audioStreamType = AUDIO_STREAM_MUSIC; + } + MediaPlayer* mp = new MediaPlayer(); if (mp->setDataSource(file, NULL) == NO_ERROR) { - mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE); + mp->setAudioStreamType(audioStreamType); mp->prepare(); } else { LOGE("Failed to load CameraService sounds: %s", file); |