diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-01-06 15:51:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-06 15:51:44 -0800 |
commit | 143c7c885487ff665ad87c259d4b3b089d0bfec4 (patch) | |
tree | 0411c1f89b919f20be187bef9eb1c39b1facd9f4 /services/camera/libcameraservice/CameraService.cpp | |
parent | 9f0dfcd64a764126359553933fdd6a766f6565d8 (diff) | |
parent | 4bc873e6ff73200af866f8c9efca66ad8ed23682 (diff) | |
download | frameworks_base-143c7c885487ff665ad87c259d4b3b089d0bfec4.zip frameworks_base-143c7c885487ff665ad87c259d4b3b089d0bfec4.tar.gz frameworks_base-143c7c885487ff665ad87c259d4b3b089d0bfec4.tar.bz2 |
am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
Switch camera sounds to always use the system enforced audio stream.
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index f841ec7..2283437 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -97,16 +97,6 @@ void CameraService::onFirstRef() setCameraFree(i); } } - - // Read the system property to determine if we have to use the - // AUDIO_STREAM_ENFORCED_AUDIBLE type. - char value[PROPERTY_VALUE_MAX]; - property_get("ro.camera.sound.forced", value, "0"); - if (strcmp(value, "0") != 0) { - mAudioStreamType = AUDIO_STREAM_ENFORCED_AUDIBLE; - } else { - mAudioStreamType = AUDIO_STREAM_MUSIC; - } } CameraService::~CameraService() { @@ -295,7 +285,7 @@ void CameraService::setCameraFree(int cameraId) { MediaPlayer* CameraService::newMediaPlayer(const char *file) { MediaPlayer* mp = new MediaPlayer(); if (mp->setDataSource(file, NULL) == NO_ERROR) { - mp->setAudioStreamType(mAudioStreamType); + mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE); mp->prepare(); } else { LOGE("Failed to load CameraService sounds: %s", file); |