diff options
| author | Eric Laurent <elaurent@google.com> | 2014-10-07 20:46:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-07 20:46:03 +0000 |
| commit | 07811789ebf31f5317403356f624d04282e666aa (patch) | |
| tree | 62c42c9bc76c24ef54ead03c42501b63e706f481 | |
| parent | 5bee844fd8c2f6d9fa78ed5e063a8e3df9f2f7b6 (diff) | |
| parent | f380677f21240ffb78bcdf7c804fe0a7807fb08d (diff) | |
| download | frameworks_av-07811789ebf31f5317403356f624d04282e666aa.zip frameworks_av-07811789ebf31f5317403356f624d04282e666aa.tar.gz frameworks_av-07811789ebf31f5317403356f624d04282e666aa.tar.bz2 | |
Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev
| -rw-r--r-- | services/audiopolicy/AudioPolicyClientImplLegacy.cpp | 2 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp index 9639096..97719da 100644 --- a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp +++ b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp @@ -96,7 +96,7 @@ static audio_io_handle_t open_output(audio_module_handle_t module, *pFormat = config.format; *pChannelMask = config.channel_mask; if (offloadInfo != NULL) { - *offloadInfo = config.offload_info; + *((audio_offload_info_t *)offloadInfo) = config.offload_info; } } return output; diff --git a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp index 9f66fd1..e1e81e1 100644 --- a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp +++ b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp @@ -24,6 +24,7 @@ #include <system/audio.h> #include <system/audio_policy.h> #include <hardware/audio_policy.h> +#include <media/AudioPolicyHelper.h> namespace android { @@ -525,7 +526,7 @@ status_t AudioPolicyService::setAudioPortConfig(const struct audio_port_config * return INVALID_OPERATION; } -audio_io_handle_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr __unused, +audio_io_handle_t AudioPolicyService::getOutputForAttr(const audio_attributes_t *attr, uint32_t samplingRate, audio_format_t format, audio_channel_mask_t channelMask, |