summaryrefslogtreecommitdiffstats
path: root/include/hardware/audio.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-17 11:33:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 11:33:22 -0800
commitfad1f606a2a67ed15ea5ef0368cb3eb94756baae (patch)
treedf4917db21c109bf05eb9c365f2effff5efb5e0d /include/hardware/audio.h
parentc38e7baa4f7f0ee69ba494a4624d1f6dd3e21bec (diff)
parent6df641e269639dbb81bb1c19f47d3b9e5e3ff7d7 (diff)
downloadhardware_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 'include/hardware/audio.h')
-rw-r--r--include/hardware/audio.h5
1 files changed, 2 insertions, 3 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);