diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-13 15:05:25 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-14 14:49:36 -0700 |
| commit | c3df838434b37d8400eea2438083cc01a4c1cc71 (patch) | |
| tree | ecd066c03170c4dd2afae2d7247b6aafd4957fe2 /services/audioflinger/Threads.cpp | |
| parent | 05997e21af6c4517f375def6563af4b9ebe95f39 (diff) | |
| download | frameworks_av-c3df838434b37d8400eea2438083cc01a4c1cc71.zip frameworks_av-c3df838434b37d8400eea2438083cc01a4c1cc71.tar.gz frameworks_av-c3df838434b37d8400eea2438083cc01a4c1cc71.tar.bz2 | |
Replace if/else by switch
Change-Id: Ibe96c8fb1f0ba7f850c0561f60769ce63aceba5d
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 1b0a601..f7cd926 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1340,7 +1340,9 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac } *pFrameCount = frameCount; - if (mType == DIRECT) { + switch (mType) { + + case DIRECT: if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM) { if (sampleRate != mSampleRate || format != mFormat || channelMask != mChannelMask) { ALOGE("createTrack_l() Bad parameter: sampleRate %u format %#x, channelMask 0x%08x " @@ -1350,7 +1352,9 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac goto Exit; } } - } else if (mType == OFFLOAD) { + break; + + case OFFLOAD: if (sampleRate != mSampleRate || format != mFormat || channelMask != mChannelMask) { ALOGE("createTrack_l() Bad parameter: sampleRate %d format %#x, channelMask 0x%08x \"" "for output %p with format %#x", @@ -1358,7 +1362,9 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac lStatus = BAD_VALUE; goto Exit; } - } else { + break; + + default: if ((format & AUDIO_FORMAT_MAIN_MASK) != AUDIO_FORMAT_PCM) { ALOGE("createTrack_l() Bad parameter: format %#x \"" "for output %p with format %#x", @@ -1372,6 +1378,8 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac lStatus = BAD_VALUE; goto Exit; } + break; + } lStatus = initCheck(); |