summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorAndreas Huber <>2009-03-24 18:14:23 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 18:14:23 -0700
commit4873375b2a7da6b6c323987203c1c11f3eb74201 (patch)
tree28b17032dfc0265d6515e32119ccae86293404bd /camera
parent610704c15981a568c93e5fb0ef90dd4c34bfba7c (diff)
downloadframeworks_base-4873375b2a7da6b6c323987203c1c11f3eb74201.zip
frameworks_base-4873375b2a7da6b6c323987203c1c11f3eb74201.tar.gz
frameworks_base-4873375b2a7da6b6c323987203c1c11f3eb74201.tar.bz2
Automated import from //branches/cupcake/...@141708,141708
Diffstat (limited to 'camera')
-rw-r--r--camera/libcameraservice/CameraService.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 6a6a811..7e5fdbe 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -492,6 +492,7 @@ status_t CameraService::Client::startPreview()
status_t CameraService::Client::startRecording()
{
if (mMediaPlayerBeep.get() != NULL) {
+ mMediaPlayerBeep->seekTo(0);
mMediaPlayerBeep->start();
}
return startCameraMode(CAMERA_RECORDING_MODE);
@@ -533,6 +534,7 @@ void CameraService::Client::stopRecording()
}
if (mMediaPlayerBeep.get() != NULL) {
+ mMediaPlayerBeep->seekTo(0);
mMediaPlayerBeep->start();
}
mHardware->stopRecording();
@@ -733,6 +735,7 @@ void CameraService::Client::shutterCallback(void *user)
// Play shutter sound.
if (client->mMediaPlayerClick.get() != NULL) {
+ client->mMediaPlayerClick->seekTo(0);
client->mMediaPlayerClick->start();
}