diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-27 07:19:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-27 07:19:10 -0800 |
| commit | 591993f162d0dbf7f6ce0e33a5f8f1bb687e91ce (patch) | |
| tree | 1d4f2b2c2242c29f40ef6aefcec24eb5f8703955 | |
| parent | 86012869b8a99e43158f9fe6488b5928a034b03b (diff) | |
| parent | 452d6d6efe062b7cee10cc2b543c0b857f171022 (diff) | |
| download | frameworks_base-591993f162d0dbf7f6ce0e33a5f8f1bb687e91ce.zip frameworks_base-591993f162d0dbf7f6ce0e33a5f8f1bb687e91ce.tar.gz frameworks_base-591993f162d0dbf7f6ce0e33a5f8f1bb687e91ce.tar.bz2 | |
Merge "Use enum effect_state consistently"
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index a291113..2166e31 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -1086,7 +1086,7 @@ private: void reset_l(); status_t configure(); status_t init(); - uint32_t state() { + effect_state state() const { return mState; } uint32_t status() { @@ -1151,8 +1151,8 @@ mutable Mutex mLock; // mutex for process, commands and handl effect_descriptor_t mDescriptor;// effect descriptor received from effect engine effect_config_t mConfig; // input and output audio configuration effect_handle_t mEffectInterface; // Effect module C API - status_t mStatus; // initialization status - uint32_t mState; // current activation state (effect_state) + status_t mStatus; // initialization status + effect_state mState; // current activation state Vector< wp<EffectHandle> > mHandles; // list of client handles uint32_t mMaxDisableWaitCnt; // maximum grace period before forcing an effect off after // sending disable command. |