SHOW:
|
|
- or go back to the newest paste.
| 1 | diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp | |
| 2 | index f18245f..63d17f0 100644 | |
| 3 | --- a/services/camera/libcameraservice/CameraService.cpp | |
| 4 | +++ b/services/camera/libcameraservice/CameraService.cpp | |
| 5 | @@ -1319,15 +1319,18 @@ MediaPlayer* CameraService::newMediaPlayer(const char *file) {
| |
| 6 | } | |
| 7 | ||
| 8 | void CameraService::loadSound() {
| |
| 9 | +#if 0 | |
| 10 | Mutex::Autolock lock(mSoundLock); | |
| 11 | LOG1("CameraService::loadSound ref=%d", mSoundRef);
| |
| 12 | if (mSoundRef++) return; | |
| 13 | ||
| 14 | mSoundPlayer[SOUND_SHUTTER] = newMediaPlayer("/system/media/audio/ui/camera_click.ogg");
| |
| 15 | mSoundPlayer[SOUND_RECORDING] = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg");
| |
| 16 | +#endif | |
| 17 | } | |
| 18 | ||
| 19 | void CameraService::releaseSound() {
| |
| 20 | +#if 0 | |
| 21 | Mutex::Autolock lock(mSoundLock); | |
| 22 | LOG1("CameraService::releaseSound ref=%d", mSoundRef);
| |
| 23 | if (--mSoundRef) return; | |
| 24 | @@ -1338,6 +1341,7 @@ void CameraService::releaseSound() {
| |
| 25 | mSoundPlayer[i].clear(); | |
| 26 | } | |
| 27 | } | |
| 28 | +#endif | |
| 29 | } | |
| 30 | ||
| 31 | void CameraService::playSound(sound_kind kind) { |
