diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-08 17:45:44 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-08 17:45:44 -0800 |
| commit | a19ffb656616feec70613ba67ddfe15a504a4e76 (patch) | |
| tree | 4fdde29e9a31aa2ea250b4d2cf2b26bc556d3432 /include | |
| parent | 5e5631bbf2403b8242e77977792318d65362ed91 (diff) | |
| parent | 6374252107fd6539397598195ea6defd5870fafb (diff) | |
| download | frameworks_av-a19ffb656616feec70613ba67ddfe15a504a4e76.zip frameworks_av-a19ffb656616feec70613ba67ddfe15a504a4e76.tar.gz frameworks_av-a19ffb656616feec70613ba67ddfe15a504a4e76.tar.bz2 | |
Merge "audio policy: use audio_devices_t when appropriate"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index d54ab35..cc0a594 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -185,7 +185,7 @@ public: audio_devices_t device); static uint32_t getStrategyForStream(audio_stream_type_t stream); - static uint32_t getDevicesForStream(audio_stream_type_t stream); + static audio_devices_t getDevicesForStream(audio_stream_type_t stream); static audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc); static status_t registerEffect(effect_descriptor_t *desc, diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index bdd7747..04c927a 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -79,7 +79,7 @@ public: int *index, audio_devices_t device) = 0; virtual uint32_t getStrategyForStream(audio_stream_type_t stream) = 0; - virtual uint32_t getDevicesForStream(audio_stream_type_t stream) = 0; + virtual audio_devices_t getDevicesForStream(audio_stream_type_t stream) = 0; virtual audio_io_handle_t getOutputForEffect(effect_descriptor_t *desc) = 0; virtual status_t registerEffect(effect_descriptor_t *desc, audio_io_handle_t io, |