diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-17 11:33:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-17 11:33:22 -0800 |
| commit | fad1f606a2a67ed15ea5ef0368cb3eb94756baae (patch) | |
| tree | df4917db21c109bf05eb9c365f2effff5efb5e0d /modules/audio | |
| parent | c38e7baa4f7f0ee69ba494a4624d1f6dd3e21bec (diff) | |
| parent | 6df641e269639dbb81bb1c19f47d3b9e5e3ff7d7 (diff) | |
| download | hardware_libhardware-fad1f606a2a67ed15ea5ef0368cb3eb94756baae.zip hardware_libhardware-fad1f606a2a67ed15ea5ef0368cb3eb94756baae.tar.gz hardware_libhardware-fad1f606a2a67ed15ea5ef0368cb3eb94756baae.tar.bz2 | |
Merge "set_mode and set_phone_state now take audio_mode_t"
Diffstat (limited to 'modules/audio')
| -rw-r--r-- | modules/audio/audio_hw.c | 2 | ||||
| -rw-r--r-- | modules/audio/audio_policy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/audio/audio_hw.c b/modules/audio/audio_hw.c index a482604..6465df9 100644 --- a/modules/audio/audio_hw.c +++ b/modules/audio/audio_hw.c @@ -278,7 +278,7 @@ static int adev_set_master_volume(struct audio_hw_device *dev, float volume) return -ENOSYS; } -static int adev_set_mode(struct audio_hw_device *dev, int mode) +static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode) { return 0; } diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c index 3313d48..c805601 100644 --- a/modules/audio/audio_policy.c +++ b/modules/audio/audio_policy.c @@ -58,7 +58,7 @@ static audio_policy_dev_state_t ap_get_device_connection_state( return AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE; } -static void ap_set_phone_state(struct audio_policy *pol, int state) +static void ap_set_phone_state(struct audio_policy *pol, audio_mode_t state) { } |