summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorAndreas Huber <>2009-03-24 20:47:19 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 20:47:19 -0700
commite25b51baf43bab5b8c19546a93c0bf73025ffbee (patch)
treee7e40afde4999f7e7098cfec46176a439ce98630 /camera
parent997c7612a8cf63748165144b423ff2ae8e73c3e9 (diff)
downloadframeworks_base-e25b51baf43bab5b8c19546a93c0bf73025ffbee.zip
frameworks_base-e25b51baf43bab5b8c19546a93c0bf73025ffbee.tar.gz
frameworks_base-e25b51baf43bab5b8c19546a93c0bf73025ffbee.tar.bz2
Automated import from //branches/donutburger/...@141711,141711
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();
}