summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-02-10 15:32:16 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-10 15:32:16 -0800
commitb6333aa8317ce5162ab006c4baed6b0890936dc7 (patch)
treed4fb7b888a6b12f4d3c35c0a84d49490dc33bc8e /services/audioflinger/AudioFlinger.h
parent3a144d08b713e3c0f6b7b8e95bc42cef5886f4fa (diff)
parentb28686f95daee16edeb5f39af2cd5274ac3dc99f (diff)
downloadframeworks_av-b6333aa8317ce5162ab006c4baed6b0890936dc7.zip
frameworks_av-b6333aa8317ce5162ab006c4baed6b0890936dc7.tar.gz
frameworks_av-b6333aa8317ce5162ab006c4baed6b0890936dc7.tar.bz2
Merge "Simplify ThreadBase::exit() aka requestExitAndWait"
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 45df893..c66b19e 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -401,6 +401,8 @@ private:
audio_format_t format() const { return mFormat; }
size_t frameCount() const { return mFrameCount; }
void wakeUp() { mWaitWorkCV.broadcast(); }
+ // Should be "virtual status_t requestExitAndWait()" and override same
+ // method in Thread, but Thread::requestExitAndWait() is not yet virtual.
void exit();
virtual bool checkForNewParameters_l() = 0;
virtual status_t setParameters(const String8& keyValuePairs);
@@ -532,7 +534,6 @@ private:
Vector<ConfigEvent> mConfigEvents;
bool mStandby;
const audio_io_handle_t mId;
- bool mExiting;
Vector< sp<EffectChain> > mEffectChains;
uint32_t mDevice; // output device for PlaybackThread
// input + output devices for RecordThread