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 /include/media | |
| 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 'include/media')
| -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 6a15f6e..9369078 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -62,8 +62,8 @@ public: static status_t setStreamMute(int stream, bool mute); static status_t getStreamMute(int 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 9e3cb7f..b4a1970 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -96,7 +96,7 @@ public: virtual bool streamMute(int 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 9807cbe..2ad3d8c 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; |