diff options
| author | Eric Laurent <elaurent@google.com> | 2014-10-07 21:14:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 21:14:54 +0000 |
| commit | 3a138ea2ba8265776096684527a991925134b2f8 (patch) | |
| tree | 08827dd1860ac2a968824e404178a2fd40c0237b /services | |
| parent | f46bd1e76c553b04cc963afa27e36c6d8931ace0 (diff) | |
| parent | 8e12cdf97f01b5774be555ad657f7290c0da18cd (diff) | |
| download | frameworks_av-3a138ea2ba8265776096684527a991925134b2f8.zip frameworks_av-3a138ea2ba8265776096684527a991925134b2f8.tar.gz frameworks_av-3a138ea2ba8265776096684527a991925134b2f8.tar.bz2 | |
am 8e12cdf9: am 7c6977c4: am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev
* commit '8e12cdf97f01b5774be555ad657f7290c0da18cd':
audio policy: fix build with USE_LEGACY_AUDIO_POLICY
Diffstat (limited to 'services')
| -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, |