diff options
author | Glenn Kasten <gkasten@google.com> | 2012-01-17 11:32:53 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-17 11:32:53 -0800 |
commit | 0696400a6bb9abbed62b3b9c6aa105495dc600a2 (patch) | |
tree | 2368d7ccb33fbceb99585839b85420e38e59abf0 | |
parent | a9b21c5a7c24fe14d20372263c0bf5faf3d3e348 (diff) | |
parent | f78aee70d15daf4690de7e7b4983ee68b0d1381d (diff) | |
download | frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.zip frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.tar.gz frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.tar.bz2 |
Merge "Use audio_mode_t consistently"
-rw-r--r-- | include/media/AudioSystem.h | 6 | ||||
-rw-r--r-- | include/media/IAudioFlinger.h | 2 | ||||
-rw-r--r-- | include/media/IAudioPolicyService.h | 2 | ||||
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 | ||||
-rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 4 | ||||
-rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 10 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 12 | ||||
-rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/AudioPolicyService.h | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index e49d8f5..2ba083d 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -62,8 +62,8 @@ public: static status_t setStreamMute(audio_stream_type_t stream, bool mute); static status_t getStreamMute(audio_stream_type_t stream, bool* mute); - // set audio mode in audio hardware (see audio_mode_t) - static status_t setMode(int mode); + // set audio mode in audio hardware + static status_t setMode(audio_mode_t mode); // returns true in *state if tracks are active on the specified stream or has been active // in the past inPastMs milliseconds @@ -142,7 +142,7 @@ public: // static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state, const char *device_address); static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device, const char *device_address); - static status_t setPhoneState(int state); + static status_t setPhoneState(audio_mode_t state); static status_t setRingerMode(uint32_t mode, uint32_t mask); static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config); static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage); diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 15d3ca9..3999479 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -96,7 +96,7 @@ public: virtual bool streamMute(audio_stream_type_t stream) const = 0; // set audio mode - virtual status_t setMode(int mode) = 0; + virtual status_t setMode(audio_mode_t mode) = 0; // mic mute/state virtual status_t setMicMute(bool state) = 0; diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 1ac0bbf..ed64c77 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -45,7 +45,7 @@ public: const char *device_address) = 0; virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device, const char *device_address) = 0; - virtual status_t setPhoneState(int state) = 0; + virtual status_t setPhoneState(audio_mode_t state) = 0; virtual status_t setRingerMode(uint32_t mode, uint32_t mask) = 0; virtual status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config) = 0; virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) = 0; diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 5193848..e537e5a 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -156,7 +156,7 @@ status_t AudioSystem::getStreamMute(audio_stream_type_t stream, bool* mute) return NO_ERROR; } -status_t AudioSystem::setMode(int mode) +status_t AudioSystem::setMode(audio_mode_t mode) { if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE; const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); @@ -536,7 +536,7 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d return aps->getDeviceConnectionState(device, device_address); } -status_t AudioSystem::setPhoneState(int state) +status_t AudioSystem::setPhoneState(audio_mode_t state) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); if (aps == 0) return PERMISSION_DENIED; diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 9ed1a2a..eef551c 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -289,7 +289,7 @@ public: return reply.readInt32(); } - virtual status_t setMode(int mode) + virtual status_t setMode(audio_mode_t mode) { Parcel data, reply; data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor()); @@ -786,7 +786,7 @@ status_t BnAudioFlinger::onTransact( } break; case SET_MODE: { CHECK_INTERFACE(IAudioFlinger, data, reply); - int mode = data.readInt32(); + audio_mode_t mode = (audio_mode_t) data.readInt32(); reply->writeInt32( setMode(mode) ); return NO_ERROR; } break; diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 67d9c45..645325b 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -91,7 +91,7 @@ public: return static_cast <audio_policy_dev_state_t>(reply.readInt32()); } - virtual status_t setPhoneState(int state) + virtual status_t setPhoneState(audio_mode_t state) { Parcel data, reply; data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor()); @@ -394,7 +394,7 @@ status_t BnAudioPolicyService::onTransact( case SET_PHONE_STATE: { CHECK_INTERFACE(IAudioPolicyService, data, reply); - reply->writeInt32(static_cast <uint32_t>(setPhoneState(data.readInt32()))); + reply->writeInt32(static_cast <uint32_t>(setPhoneState((audio_mode_t) data.readInt32()))); return NO_ERROR; } break; diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index cf925b0..0b7b7f5 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -565,7 +565,7 @@ status_t AudioFlinger::setMasterVolume(float value) return NO_ERROR; } -status_t AudioFlinger::setMode(int mode) +status_t AudioFlinger::setMode(audio_mode_t mode) { status_t ret = initCheck(); if (ret != NO_ERROR) { @@ -5900,7 +5900,7 @@ sp<AudioFlinger::EffectChain> AudioFlinger::ThreadBase::getEffectChain_l(int ses return chain; } -void AudioFlinger::ThreadBase::setMode(uint32_t mode) +void AudioFlinger::ThreadBase::setMode(audio_mode_t mode) { Mutex::Autolock _l(mLock); size_t size = mEffectChains.size(); @@ -6698,7 +6698,7 @@ status_t AudioFlinger::EffectModule::setDevice(uint32_t device) return status; } -status_t AudioFlinger::EffectModule::setMode(uint32_t mode) +status_t AudioFlinger::EffectModule::setMode(audio_mode_t mode) { Mutex::Autolock _l(mLock); status_t status = NO_ERROR; @@ -6707,7 +6707,7 @@ status_t AudioFlinger::EffectModule::setMode(uint32_t mode) uint32_t size = sizeof(status_t); status = (*mEffectInterface)->command(mEffectInterface, EFFECT_CMD_SET_AUDIO_MODE, - sizeof(int), + sizeof(audio_mode_t), &mode, &size, &cmdStatus); @@ -7357,7 +7357,7 @@ void AudioFlinger::EffectChain::setDevice_l(uint32_t device) } // setMode_l() must be called with PlaybackThread::mLock held -void AudioFlinger::EffectChain::setMode_l(uint32_t mode) +void AudioFlinger::EffectChain::setMode_l(audio_mode_t mode) { size_t size = mEffects.size(); for (size_t i = 0; i < size; i++) { diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 9d1d862..01b4fe5 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -99,7 +99,7 @@ public: virtual float streamVolume(audio_stream_type_t stream, int output) const; virtual bool streamMute(audio_stream_type_t 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 @@ -1113,7 +1113,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); @@ -1266,7 +1266,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; @@ -1399,7 +1399,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; diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 44311d0..c69944a 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -185,7 +185,7 @@ audio_policy_dev_state_t AudioPolicyService::getDeviceConnectionState( device_address); } -status_t AudioPolicyService::setPhoneState(int state) +status_t AudioPolicyService::setPhoneState(audio_mode_t state) { if (mpAudioPolicy == NULL) { return NO_INIT; diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index e98ec68..127f1ec 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -58,7 +58,7 @@ public: virtual audio_policy_dev_state_t getDeviceConnectionState( audio_devices_t device, const char *device_address); - virtual status_t setPhoneState(int state); + virtual status_t setPhoneState(audio_mode_t state); virtual status_t setRingerMode(uint32_t mode, uint32_t mask); virtual status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config); virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage); |