summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-20 16:46:41 -0700
committerGlenn Kasten <gkasten@google.com>2012-07-10 08:28:31 -0700
commit9f34a36d9cdb9595c288e50ffe00da038bc8abb9 (patch)
tree6b7e7720d4856de8d88b44f5eae3f62993761b2e /services/audioflinger/AudioFlinger.h
parent7d6c35bf132a46c0a8a9826491882495fc98bd8c (diff)
downloadframeworks_av-9f34a36d9cdb9595c288e50ffe00da038bc8abb9.zip
frameworks_av-9f34a36d9cdb9595c288e50ffe00da038bc8abb9.tar.gz
frameworks_av-9f34a36d9cdb9595c288e50ffe00da038bc8abb9.tar.bz2
Whitespace and indentation
Change-Id: I424052b4ff9218147a5cfc8e6dcd67fe8105d229
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 56d5a15..30915a8 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -732,9 +732,7 @@ private:
void flush();
void destroy();
void mute(bool);
- int name() const {
- return mName;
- }
+ int name() const { return mName; }
audio_stream_type_t streamType() const {
return mStreamType;
@@ -1102,6 +1100,7 @@ public:
// mStreamTypes[] uses 1 additional stream type internally for the OutputTrack used by DuplicatingThread
stream_type_t mStreamTypes[AUDIO_STREAM_CNT + 1];
AudioStreamOut *mOutput;
+
float mMasterVolume;
nsecs_t mLastWriteTime;
int mNumWrites;