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

Commit f237a30e authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove dead setVolume() and mVolume[2]"

parents 3f6448e0 ad0f6cc5

services/audioflinger/AudioFlinger.cpp

+0 −12
Original line number Diff line number Diff line
@@ -3385,8 +3385,6 @@ AudioFlinger::PlaybackThread::Track::Track( 
        if (mName < 0) {

            ALOGE("no more track names available");

        }

        mVolume[0] = 1.0f;

        mVolume[1] = 1.0f;

        mStreamType = streamType;

        // NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of

        // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack
@@ -3648,12 +3646,6 @@ void AudioFlinger::PlaybackThread::Track::mute(bool muted) 
    mMute = muted;

}



void AudioFlinger::PlaybackThread::Track::setVolume(float left, float right)

{

    mVolume[0] = left;

    mVolume[1] = right;

}



status_t AudioFlinger::PlaybackThread::Track::attachAuxEffect(int EffectId)

{

    status_t status = DEAD_OBJECT;
@@ -4103,10 +4095,6 @@ void AudioFlinger::TrackHandle::pause() { 
    mTrack->pause();

}



void AudioFlinger::TrackHandle::setVolume(float left, float right) {

    mTrack->setVolume(left, right);

}



sp<IMemory> AudioFlinger::TrackHandle::getCblk() const {

    return mTrack->getCblk();

}

services/audioflinger/AudioFlinger.h

+0 −3
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ private: 
                    void        flush();

                    void        destroy();

                    void        mute(bool);

                    void        setVolume(float left, float right);

                    int name() const {

                        return mName;

                    }
@@ -633,7 +632,6 @@ private: 
            }



            // we don't really need a lock for these

            float               mVolume[2];

            volatile bool       mMute;

            // FILLED state is used for suppressing volume ramp at begin of playing

            enum {FS_FILLING, FS_FILLED, FS_ACTIVE};
@@ -908,7 +906,6 @@ private: 
        virtual void        flush();

        virtual void        mute(bool);

        virtual void        pause();

        virtual void        setVolume(float left, float right);

        virtual sp<IMemory> getCblk() const;

        virtual status_t    attachAuxEffect(int effectId);

        virtual status_t onTransact(