diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-01-06 15:49:17 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-06 15:49:17 -0800 |
commit | 4bc873e6ff73200af866f8c9efca66ad8ed23682 (patch) | |
tree | ae87da85e5c8f7753d69ec8698a87138dcd0e6d0 /services/camera | |
parent | c2eaee533fe25cd9a0781f349e9c8c7ef02bd648 (diff) | |
parent | 7944704e6c4cc10105838b78d3d8403bf66a066b (diff) | |
download | frameworks_base-4bc873e6ff73200af866f8c9efca66ad8ed23682.zip frameworks_base-4bc873e6ff73200af866f8c9efca66ad8ed23682.tar.gz frameworks_base-4bc873e6ff73200af866f8c9efca66ad8ed23682.tar.bz2 |
am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
Diffstat (limited to 'services/camera')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 12 | ||||
-rw-r--r-- | services/camera/libcameraservice/CameraService.h | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index bb0e664..52d9bf35 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); diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index cdfbc56..bad41f5 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -76,7 +76,6 @@ private: void setCameraFree(int cameraId); // sounds - audio_stream_type_t mAudioStreamType; MediaPlayer* newMediaPlayer(const char *file); Mutex mSoundLock; |