diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-06-26 09:25:47 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-12-20 12:30:29 -0800 |
| commit | aea7ea06394bcb155972d82055d4ea59962e4051 (patch) | |
| tree | dd806ad4f77dc62e4fbd0b88022ee5b8b2403802 /services/audioflinger/AudioFlinger.cpp | |
| parent | bd72d22097f78f5bd668b223bc8c94e351311e31 (diff) | |
| download | frameworks_av-aea7ea06394bcb155972d82055d4ea59962e4051.zip frameworks_av-aea7ea06394bcb155972d82055d4ea59962e4051.tar.gz frameworks_av-aea7ea06394bcb155972d82055d4ea59962e4051.tar.bz2 | |
Use AUDIO_SESSION_ALLOCATE instead of 0
Also fix a couple of places where we were using AUDIO_SESSION_OUTPUT_MIX,
which happens to also be equal to 0, but has a different meaning.
Change-Id: I90e39be3b89f5021a96d9e3b8d10929013ca977f
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 443051c..34811a7 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -534,7 +534,7 @@ sp<IAudioTrack> AudioFlinger::createTrack( client = registerPid_l(pid); ALOGV("createTrack() sessionId: %d", (sessionId == NULL) ? -2 : *sessionId); - if (sessionId != NULL && *sessionId != AUDIO_SESSION_OUTPUT_MIX) { + 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. for (size_t i = 0; i < mPlaybackThreads.size(); i++) { @@ -1324,7 +1324,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( client = registerPid_l(pid); // If no audio session id is provided, create one here - if (sessionId != NULL && *sessionId != AUDIO_SESSION_OUTPUT_MIX) { + if (sessionId != NULL && *sessionId != AUDIO_SESSION_ALLOCATE) { lSessionId = *sessionId; } else { lSessionId = nextUniqueId(); |