summaryrefslogtreecommitdiffstats
path: root/media/libmedia/Visualizer.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-17 10:06:38 -0800
committerGlenn Kasten <gkasten@google.com>2012-01-17 10:06:38 -0800
commita9b21c5a7c24fe14d20372263c0bf5faf3d3e348 (patch)
treeae5642e47beac63937bc5e812532d3ddfd31507e /media/libmedia/Visualizer.cpp
parent263709e7be37c7040aaef385bc5c9389a9b5f514 (diff)
downloadframeworks_av-a9b21c5a7c24fe14d20372263c0bf5faf3d3e348.zip
frameworks_av-a9b21c5a7c24fe14d20372263c0bf5faf3d3e348.tar.gz
frameworks_av-a9b21c5a7c24fe14d20372263c0bf5faf3d3e348.tar.bz2
Rename Visualizer::mLock
This avoids confusion with parent class AudioEffect's mLock which is protected. Change-Id: I2ae0b0869fe3c606f682252973795b34477951d0
Diffstat (limited to 'media/libmedia/Visualizer.cpp')
-rw-r--r--media/libmedia/Visualizer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp
index 66758d2..dba257d 100644
--- a/media/libmedia/Visualizer.cpp
+++ b/media/libmedia/Visualizer.cpp
@@ -54,7 +54,7 @@ Visualizer::~Visualizer()
status_t Visualizer::setEnabled(bool enabled)
{
- Mutex::Autolock _l(mLock);
+ Mutex::Autolock _l(mCaptureLock);
sp<CaptureThread> t = mCaptureThread;
if (t != 0) {
@@ -93,7 +93,7 @@ status_t Visualizer::setCaptureCallBack(capture_cbk_t cbk, void* user, uint32_t
if (rate > CAPTURE_RATE_MAX) {
return BAD_VALUE;
}
- Mutex::Autolock _l(mLock);
+ Mutex::Autolock _l(mCaptureLock);
if (mEnabled) {
return INVALID_OPERATION;
@@ -129,7 +129,7 @@ status_t Visualizer::setCaptureSize(uint32_t size)
return BAD_VALUE;
}
- Mutex::Autolock _l(mLock);
+ Mutex::Autolock _l(mCaptureLock);
if (mEnabled) {
return INVALID_OPERATION;
}
@@ -231,7 +231,7 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform)
void Visualizer::periodicCapture()
{
- Mutex::Autolock _l(mLock);
+ Mutex::Autolock _l(mCaptureLock);
ALOGV("periodicCapture() %p mCaptureCallBack %p mCaptureFlags 0x%08x",
this, mCaptureCallBack, mCaptureFlags);
if (mCaptureCallBack != NULL &&