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 /include | |
| 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"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 6 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 2 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 2 |
3 files changed, 5 insertions, 5 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; |