commit 277a37ea5c5a5636740131c71a38de7cddbf3544
author Eric Laurent <elaurent@google.com> Mon Jul 29 18:37:52 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 29 18:37:52 2024 +0000
tree 177309a20a91f18ced51ce7b8cca33705d5fcf11
parent 55b2a0fdcf59ad7ef9d5c39feafdcfdf49adc72d

Revert "AudioFlinger: Control volume using Port ID"

This reverts commit 55b2a0fdcf59ad7ef9d5c39feafdcfdf49adc72d.

Reason for revert: b/356164780

Change-Id: I8ffa2a3ef93f66379418344ee680b8c624843366

services/audioflinger/PlaybackTracks.h

diff --git a/services/audioflinger/PlaybackTracks.h b/services/audioflinger/PlaybackTracks.h
index 11d82b4..2cc6236 100644
--- a/services/audioflinger/PlaybackTracks.h
+++ b/services/audioflinger/PlaybackTracks.h
@@ -96,8 +96,7 @@
                                 size_t frameCountToBeReady = SIZE_MAX,
                                 float speed = 1.0f,
                                 bool isSpatialized = false,
-                                bool isBitPerfect = false,
-                                float volume = 0.0f);
+                                bool isBitPerfect = false);
     ~Track() override;
     status_t initCheck() const final;
     void appendDumpHeader(String8& result) const final;
@@ -223,14 +222,6 @@
 
     bool getInternalMute() const final { return mInternalMute; }
     void setInternalMute(bool muted) final { mInternalMute = muted; }
-
-    // VolumePortInterface implementation
-    void setPortVolume(float volume) override {
-        mVolume = volume;
-        signal();
-    }
-    float getPortVolume() const override { return mVolume; }
-
 protected:
 
     DISALLOW_COPY_AND_ASSIGN(Track);
@@ -412,8 +403,8 @@
     // access these two variables only when holding player thread lock.
     std::unique_ptr<os::PersistableBundle> mMuteEventExtras;
     mute_state_t        mMuteState;
+
     bool                mInternalMute = false;
-    float mVolume = 0.0f;
 };  // end of Track