Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55ede9d authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge "Remove usage of undeclared and unused variable mFastTrackNames" into pi-dev 

am: 1f0cbedd

Change-Id: I0e5200b10d2327ffe80a507911e8e2659775865e
parents 90aae0de 1f0cbedd

services/audioflinger/FastMixer.cpp

+0 −9
Original line number Diff line number Diff line
@@ -216,11 +216,6 @@ void FastMixer::onStateChange() 
            mWarmupNsMax = LONG_MAX;

        }

        mMixerBufferState = UNDEFINED;

#if !LOG_NDEBUG

        for (unsigned i = 0; i < FastMixerState::sMaxFastTracks; ++i) {

            mFastTrackNames[i] = -1;

        }

#endif

        // we need to reconfigure all active tracks

        previousTrackMask = 0;

        mFastTracksGen = current->mFastTracksGen - 1;
@@ -245,9 +240,6 @@ void FastMixer::onStateChange() 
            if (mMixer != NULL) {

                mMixer->destroy(i);

            }

#if !LOG_NDEBUG

            mFastTrackNames[i] = -1;

#endif

            // don't reset track dump state, since other side is ignoring it

            mGenerations[i] = fastTrack->mGeneration;

        }
@@ -259,7 +251,6 @@ void FastMixer::onStateChange() 
            addedTracks &= ~(1 << i);

            const FastTrack* fastTrack = &current->mFastTracks[i];

            AudioBufferProvider *bufferProvider = fastTrack->mBufferProvider;

            ALOG_ASSERT(bufferProvider != NULL && mFastTrackNames[i] == -1);

            if (mMixer != NULL) {

                const int name = i; // for clarity, choose name as fast track index.

                status_t status = mMixer->create(