summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-07-02 12:45:10 -0700
committerGlenn Kasten <gkasten@google.com>2012-07-10 08:25:35 -0700
commit7d6c35bf132a46c0a8a9826491882495fc98bd8c (patch)
tree75860c2ae1264af58a4ee7e849ce982a9d00f486 /services
parenta51b4acf038ecd7728a98b85749eefc165aa358a (diff)
downloadframeworks_av-7d6c35bf132a46c0a8a9826491882495fc98bd8c.zip
frameworks_av-7d6c35bf132a46c0a8a9826491882495fc98bd8c.tar.gz
frameworks_av-7d6c35bf132a46c0a8a9826491882495fc98bd8c.tar.bz2
Move constant initializations from onFirstRef() to constructor
Change-Id: I57f55b0bd1edee105c58c3a055f95f1e4a2c9646
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioFlinger.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 59c7f84..fe84893 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -210,8 +210,9 @@ out:
AudioFlinger::AudioFlinger()
: BnAudioFlinger(),
mPrimaryHardwareDev(NULL),
- mHardwareStatus(AUDIO_HW_IDLE), // see also onFirstRef()
+ mHardwareStatus(AUDIO_HW_IDLE),
mMasterVolume(1.0f),
+ mMasterVolumeSW(1.0f),
mMasterVolumeSupportLvl(MVS_NONE),
mMasterMute(false),
mNextUniqueId(1),
@@ -241,9 +242,6 @@ void AudioFlinger::onFirstRef()
}
mMode = AUDIO_MODE_NORMAL;
- mMasterVolumeSW = 1.0;
- mMasterVolume = 1.0;
- mHardwareStatus = AUDIO_HW_IDLE;
}
AudioFlinger::~AudioFlinger()