summaryrefslogtreecommitdiffstats
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
commite4d3058e2ffaec9ab0e1983676d31dce20eae5de (patch)
tree46bd586546ef896364e889f10075a0a40e373511
parentab9687f0f8e9c6ac29ed25a07fa67993b7664408 (diff)
downloadframeworks_native-e4d3058e2ffaec9ab0e1983676d31dce20eae5de.zip
frameworks_native-e4d3058e2ffaec9ab0e1983676d31dce20eae5de.tar.gz
frameworks_native-e4d3058e2ffaec9ab0e1983676d31dce20eae5de.tar.bz2
Automated import from //branches/cupcake/...@141708,141708
-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();
}