diff options
| author | Eric Laurent <elaurent@google.com> | 2012-01-19 10:00:02 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-01-19 10:00:02 -0800 |
| commit | aeeb7e219e34d2d657d829913659a4e10e976375 (patch) | |
| tree | e8e5714af790d29647ae7080f2276bce93074075 /services/audioflinger/AudioFlinger.h | |
| parent | 27a0d83f53ddbfd6449ab0e3c786742a2cd135a9 (diff) | |
| parent | 9e5af59badab79128c03c79534a20f09b6e93cfe (diff) | |
| download | frameworks_av-aeeb7e219e34d2d657d829913659a4e10e976375.zip frameworks_av-aeeb7e219e34d2d657d829913659a4e10e976375.tar.gz frameworks_av-aeeb7e219e34d2d657d829913659a4e10e976375.tar.bz2 | |
resolved conflicts for merge of 05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 275f40e..8a82bdb 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -830,7 +830,9 @@ private: virtual uint32_t idleSleepTimeUs(); virtual uint32_t suspendSleepTimeUs(); - AudioMixer* mAudioMixer; + AudioMixer* mAudioMixer; + uint32_t mPrevMixerStatus; // previous status (mixer_state) returned by + // prepareTracks_l() }; class DirectOutputThread : public PlaybackThread { |