diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-04 11:00:47 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-12 09:52:37 -0800 |
| commit | f78aee70d15daf4690de7e7b4983ee68b0d1381d (patch) | |
| tree | c84e36c036a847bdf12f44c949eacb7b3ba79698 /services/audioflinger/AudioFlinger.h | |
| parent | d5a8bf0bca459389cdb81fdcc30893516bdce951 (diff) | |
| download | frameworks_av-f78aee70d15daf4690de7e7b4983ee68b0d1381d.zip frameworks_av-f78aee70d15daf4690de7e7b4983ee68b0d1381d.tar.gz frameworks_av-f78aee70d15daf4690de7e7b4983ee68b0d1381d.tar.bz2 | |
Use audio_mode_t consistently
It was int or uint32_t.
Also make getMode() const.
Change-Id: Ibe45aadbf413b9158e4dd17f2b3bcc6355288d37
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index f99e764..301ab6d 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -99,7 +99,7 @@ public: virtual float streamVolume(int stream, int output) const; virtual bool streamMute(int stream) const; - virtual status_t setMode(int mode); + virtual status_t setMode(audio_mode_t mode); virtual status_t setMicMute(bool state); virtual bool getMicMute() const; @@ -202,7 +202,7 @@ public: Parcel* reply, uint32_t flags); - uint32_t getMode() { return mMode; } + audio_mode_t getMode() const { return mMode; } bool btNrecIsOff() { return mBtNrecIsOff; } @@ -461,7 +461,7 @@ private: // unlock effect chains after process void unlockEffectChains(Vector<sp <EffectChain> >& effectChains); // set audio mode to all effect chains - void setMode(uint32_t mode); + void setMode(audio_mode_t mode); // get effect module with corresponding ID on specified audio session sp<AudioFlinger::EffectModule> getEffect_l(int sessionId, int effectId); // add and effect module. Also creates the effect chain is none exists for @@ -1111,7 +1111,7 @@ private: status_t setDevice(uint32_t device); status_t setVolume(uint32_t *left, uint32_t *right, bool controller); - status_t setMode(uint32_t mode); + status_t setMode(audio_mode_t mode); status_t start(); status_t stop(); void setSuspended(bool suspended); @@ -1264,7 +1264,7 @@ mutable Mutex mLock; // mutex for process, commands and handl sp<EffectModule> getEffectFromType_l(const effect_uuid_t *type); bool setVolume_l(uint32_t *left, uint32_t *right); void setDevice_l(uint32_t device); - void setMode_l(uint32_t mode); + void setMode_l(audio_mode_t mode); void setInBuffer(int16_t *buffer, bool ownsBuffer = false) { mInBuffer = buffer; @@ -1395,7 +1395,7 @@ mutable Mutex mLock; // mutex for process, commands and handl DefaultKeyedVector< pid_t, sp<NotificationClient> > mNotificationClients; volatile int32_t mNextUniqueId; - uint32_t mMode; + audio_mode_t mMode; bool mBtNrecIsOff; Vector<AudioSessionRef*> mAudioSessionRefs; |