diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-10-17 19:03:12 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-10-17 19:04:00 +0800 |
| commit | ff4f55c8d77e276dbcceedb4e560ca1d91ba38ba (patch) | |
| tree | 7ccb6943f3cdf945985698523a2421224fe569db /services/camera/libcameraservice/CameraService.h | |
| parent | 0cc79c66329b9ffa7d7bdfafa5d245a11fd3660d (diff) | |
| download | frameworks_av-ff4f55c8d77e276dbcceedb4e560ca1d91ba38ba.zip frameworks_av-ff4f55c8d77e276dbcceedb4e560ca1d91ba38ba.tar.gz frameworks_av-ff4f55c8d77e276dbcceedb4e560ca1d91ba38ba.tar.bz2 | |
Fix 5468644: Use the proper audio stream type to play sound.
Change-Id: I80dd37da277b1810959a2dbdd852078b26f70cf5
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 57abf83..cdfbc56 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -76,6 +76,9 @@ private: void setCameraFree(int cameraId); // sounds + audio_stream_type_t mAudioStreamType; + MediaPlayer* newMediaPlayer(const char *file); + Mutex mSoundLock; sp<MediaPlayer> mSoundPlayer[NUM_SOUNDS]; int mSoundRef; // reference count (release all MediaPlayer when 0) |