summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-13 15:00:32 -0700
committerGlenn Kasten <gkasten@google.com>2014-03-14 14:49:37 -0700
commite848bd9abb3bbbd4c66f9fb9d1442f7663d7ba40 (patch)
tree0d1142dca373dbc7d53b5c922ef7ad5f1fa41f05 /services/audioflinger/AudioFlinger.cpp
parentc5a17425986b4ce3384e6956762c86018b49c4a0 (diff)
downloadframeworks_av-e848bd9abb3bbbd4c66f9fb9d1442f7663d7ba40.zip
frameworks_av-e848bd9abb3bbbd4c66f9fb9d1442f7663d7ba40.tar.gz
frameworks_av-e848bd9abb3bbbd4c66f9fb9d1442f7663d7ba40.tar.bz2
Move declarations to where needed
Also remove unnecessary ALOGV and dead variable inFrameCount Change-Id: I34547fb0fd2ff142fc60277bedfa4064e7356611
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index ffa86c3..ef31eb9 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -558,7 +558,6 @@ sp<IAudioTrack> AudioFlinger::createTrack(
{
Mutex::Autolock _l(mLock);
PlaybackThread *thread = checkPlaybackThread_l(output);
- PlaybackThread *effectThread = NULL;
if (thread == NULL) {
ALOGE("no playback thread found for output handle %d", output);
lStatus = BAD_VALUE;
@@ -568,7 +567,7 @@ sp<IAudioTrack> AudioFlinger::createTrack(
pid_t pid = IPCThreadState::self()->getCallingPid();
client = registerPid_l(pid);
- ALOGV("createTrack() sessionId: %d", (sessionId == NULL) ? -2 : *sessionId);
+ PlaybackThread *effectThread = NULL;
if (sessionId != NULL && *sessionId != AUDIO_SESSION_ALLOCATE) {
// check if an effect chain with the same session ID is present on another
// output thread and move it here.
@@ -1319,8 +1318,6 @@ sp<IAudioRecord> AudioFlinger::openRecord(
sp<RecordHandle> recordHandle;
sp<Client> client;
status_t lStatus;
- RecordThread *thread;
- size_t inFrameCount;
int lSessionId;
// check calling permissions
@@ -1354,7 +1351,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(
{
Mutex::Autolock _l(mLock);
- thread = checkRecordThread_l(input);
+ RecordThread *thread = checkRecordThread_l(input);
if (thread == NULL) {
ALOGE("openRecord() checkRecordThread_l failed");
lStatus = BAD_VALUE;