diff options
| -rw-r--r-- | include/hardware/audio.h | 5 | ||||
| -rw-r--r-- | include/hardware/audio_policy.h | 2 | ||||
| -rw-r--r-- | modules/audio/audio_hw.c | 2 | ||||
| -rw-r--r-- | modules/audio/audio_policy.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/include/hardware/audio.h b/include/hardware/audio.h index f32a520..80eb1a7 100644 --- a/include/hardware/audio.h +++ b/include/hardware/audio.h @@ -272,12 +272,11 @@ struct audio_hw_device { int (*set_master_volume)(struct audio_hw_device *dev, float volume); /** - * setMode is called when the audio mode changes. AUDIO_MODE_NORMAL mode + * set_mode is called when the audio mode changes. AUDIO_MODE_NORMAL mode * is for standard audio playback, AUDIO_MODE_RINGTONE when a ringtone is * playing, and AUDIO_MODE_IN_CALL when a call is in progress. - * Actual type of mode is enum audio_mode_t defined in <system/audio.h>. */ - int (*set_mode)(struct audio_hw_device *dev, int mode); + int (*set_mode)(struct audio_hw_device *dev, audio_mode_t mode); /* mic mute */ int (*set_mic_mute)(struct audio_hw_device *dev, bool state); diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h index add14f8..51e0fda 100644 --- a/include/hardware/audio_policy.h +++ b/include/hardware/audio_policy.h @@ -99,7 +99,7 @@ struct audio_policy { /* indicate a change in phone state. Valid phones states are defined * by audio_mode_t */ - void (*set_phone_state)(struct audio_policy *pol, int state); + void (*set_phone_state)(struct audio_policy *pol, audio_mode_t state); /* indicate a change in ringer mode */ void (*set_ringer_mode)(struct audio_policy *pol, uint32_t mode, 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) { } |