diff options
| author | Jason Sams <> | 2009-03-24 20:36:57 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 20:36:57 -0700 |
| commit | 403914a108fec85c9677f1588b62088a416d5d1e (patch) | |
| tree | 563fad8bcb55ec3c871d15b5a1b9c4f0ed79a16f /camera/libcameraservice | |
| parent | 6ee2e78e1c74a9389db3fc687c7b03fec9494632 (diff) | |
| download | frameworks_base-403914a108fec85c9677f1588b62088a416d5d1e.zip frameworks_base-403914a108fec85c9677f1588b62088a416d5d1e.tar.gz frameworks_base-403914a108fec85c9677f1588b62088a416d5d1e.tar.bz2 | |
Automated import from //branches/donutburger/...@141598,141598
Diffstat (limited to 'camera/libcameraservice')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 851b213..c5c95b0 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -283,8 +283,14 @@ CameraService::Client::~Client() #endif } - mMediaPlayerBeep.clear(); - mMediaPlayerClick.clear(); + if (mMediaPlayerBeep.get() != NULL) { + mMediaPlayerBeep->disconnect(); + mMediaPlayerBeep.clear(); + } + if (mMediaPlayerClick.get() != NULL) { + mMediaPlayerClick->disconnect(); + mMediaPlayerClick.clear(); + } // make sure we tear down the hardware mClientPid = IPCThreadState::self()->getCallingPid(); @@ -711,9 +717,6 @@ status_t CameraService::Client::takePicture() return INVALID_OPERATION; } - if (mMediaPlayerClick.get() != NULL) { - mMediaPlayerClick->start(); - } return mHardware->takePicture(shutterCallback, yuvPictureCallback, jpegPictureCallback, @@ -751,6 +754,10 @@ void CameraService::Client::shutterCallback(void *user) client->mSurface->registerBuffers(buffers); } + + if (client->mMediaPlayerClick.get() != NULL) { + client->mMediaPlayerClick->start(); + } } // picture callback - raw image ready |