commit 2d94426cd3302cb1215c92c5f1c4b90c24ceb72b
author Glenn Kasten <gkasten@google.com> Tue Aug 13 13:54:08 2013 -0700
committer Glenn Kasten <gkasten@google.com> Wed Aug 14 17:18:50 2013 -0700
tree af82d92d37fa470693c375fc30714c93f33f7d1f
parent 295a6e8a0c0f3bc10ba6e03d3342820d4a4e85b8

Convert if/else-if in threadLoop to switch

Change-Id: I7428abb332ead6c2a1df5903f6c4e166be1f7abb

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index d6c6265..9c17574 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4232,25 +4232,41 @@
                 if (mActiveTrack->isTerminated()) {
                     removeTrack_l(mActiveTrack);
                     mActiveTrack.clear();
-                } else if (mActiveTrack->mState == TrackBase::PAUSING) {
-                    standby();
-                    mActiveTrack.clear();
-                    mStartStopCond.broadcast();
-                } else if (mActiveTrack->mState == TrackBase::RESUMING) {
-                    if (mReqChannelCount != mActiveTrack->channelCount()) {
+                } else {
+                    switch (mActiveTrack->mState) {
+                    case TrackBase::PAUSING:
+                        standby();
                         mActiveTrack.clear();
                         mStartStopCond.broadcast();
-                    } else if (readOnce) {
-                        // record start succeeds only if first read from audio input
-                        // succeeds
-                        if (mBytesRead >= 0) {
-                            mActiveTrack->mState = TrackBase::ACTIVE;
-                        } else {
+                        break;
+
+                    case TrackBase::RESUMING:
+                        if (mReqChannelCount != mActiveTrack->channelCount()) {
                             mActiveTrack.clear();
+                            mStartStopCond.broadcast();
+                        } else if (readOnce) {
+                            // record start succeeds only if first read from audio input
+                            // succeeds
+                            if (mBytesRead >= 0) {
+                                mActiveTrack->mState = TrackBase::ACTIVE;
+                            } else {
+                                mActiveTrack.clear();
+                            }
+                            mStartStopCond.broadcast();
                         }
-                        mStartStopCond.broadcast();
+                        mStandby = false;
+                        break;
+
+                    case TrackBase::ACTIVE:
+                        break;
+
+                    case TrackBase::IDLE:
+                        break;
+
+                    default:
+                        LOG_FATAL("Unexpected mActiveTrack->mState %d", mActiveTrack->mState);
                     }
-                    mStandby = false;
+
                 }
             }
             lockEffectChains_l(effectChains);