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

Commit d4513b09 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Make applyVolume private to DirectOutputThread 

Change-Id: I7ca4a59505857cbd106b6f274c66e9580dead271
parent 1465f0c3

services/audioflinger/AudioFlinger.cpp

+1 −8
Original line number Diff line number Diff line
@@ -2166,14 +2166,6 @@ if (mType == DIRECT) { 


        // only process effects if we're going to write

        if (sleepTime == 0) {



            if (mixerStatus == MIXER_TRACKS_READY) {



                // Non-trivial for DIRECT only

                applyVolume();



            }



            for (size_t i = 0; i < effectChains.size(); i ++) {

                effectChains[i]->process_l();

            }
@@ -2999,6 +2991,7 @@ void AudioFlinger::DirectOutputThread::threadLoop_mix() 
    }

    sleepTime = 0;

    standbyTime = systemTime() + standbyDelay;

    applyVolume();

}



void AudioFlinger::DirectOutputThread::threadLoop_sleepTime()

services/audioflinger/AudioFlinger.h

+3 −1
Original line number Diff line number Diff line
@@ -1004,7 +1004,6 @@ public: 
        virtual     mixer_state prepareTracks_l(Vector< sp<Track> > *tracksToRemove);

        virtual     void        threadLoop_mix();

        virtual     void        threadLoop_sleepTime();

        virtual     void        applyVolume();



        // volumes last sent to audio HAL with stream->set_volume()

        // FIXME use standard representation and names
@@ -1018,6 +1017,9 @@ public: 
        bool rampVolume;

        uint16_t leftVol;

        uint16_t rightVol;



private:

                    void        applyVolume();  // FIXME inline into threadLoop_mix()

    };



    class DuplicatingThread : public MixerThread {