diff options
| author | Eric Laurent <elaurent@google.com> | 2012-04-18 09:28:52 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-04-18 10:42:04 -0700 |
| commit | 0977cf534ffb71c2abac622716510ae8ea25f3e9 (patch) | |
| tree | 33bd54fdcbef4b06f4ff14e5f80a26817ab3bff5 /include | |
| parent | 0fa154b8d4c235401c378339828c2f85563f5faa (diff) | |
| download | hardware_libhardware_legacy-0977cf534ffb71c2abac622716510ae8ea25f3e9.zip hardware_libhardware_legacy-0977cf534ffb71c2abac622716510ae8ea25f3e9.tar.gz hardware_libhardware_legacy-0977cf534ffb71c2abac622716510ae8ea25f3e9.tar.bz2 | |
rename audio policy flags
Change-Id: Ic42eba3432671f651c9703a07fe7b429a8ec0dff
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyInterface.h | 2 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/hardware_legacy/AudioPolicyInterface.h b/include/hardware_legacy/AudioPolicyInterface.h index fd1b179..343f133 100644 --- a/include/hardware_legacy/AudioPolicyInterface.h +++ b/include/hardware_legacy/AudioPolicyInterface.h @@ -190,7 +190,7 @@ public: audio_format_t *pFormat, audio_channel_mask_t *pChannelMask, uint32_t *pLatencyMs, - audio_policy_output_flags_t flags) = 0; + audio_output_flags_t flags) = 0; // creates a special output that is duplicated to the two outputs passed as arguments. The duplication is performed by // a special mixer thread in the AudioFlinger. virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1, audio_io_handle_t output2) = 0; diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index bdfa753..bf79a9a 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -199,7 +199,7 @@ protected: uint32_t samplingRate, uint32_t format, uint32_t channelMask, - audio_policy_output_flags_t flags) const; + audio_output_flags_t flags) const; void dump(int fd); @@ -208,7 +208,7 @@ protected: Vector <audio_format_t> mFormats; // supported audio formats audio_devices_t mSupportedDevices; // supported devices (devices this output can be // routed to) - audio_policy_output_flags_t mFlags; // attribute flags (e.g primary output, + audio_output_flags_t mFlags; // attribute flags (e.g primary output, // direct output...). For outputs only. HwModule *mModule; // audio HW module exposing this I/O stream }; @@ -248,7 +248,7 @@ protected: audio_format_t mFormat; // audio_channel_mask_t mChannelMask; // output configuration uint32_t mLatency; // - audio_policy_output_flags_t mFlags; // + audio_output_flags_t mFlags; // audio_devices_t mDevice; // current device this output is routed to uint32_t mRefCount[AudioSystem::NUM_STREAM_TYPES]; // number of streams of each type using this output nsecs_t mStopTime[AudioSystem::NUM_STREAM_TYPES]; @@ -418,7 +418,7 @@ protected: uint32_t samplingRate, audio_format_t format, audio_channel_mask_t channelMask, - audio_policy_output_flags_t flags, + audio_output_flags_t flags, audio_devices_t device); virtual uint32_t getMaxEffectsCpuLoad(); @@ -454,14 +454,14 @@ protected: uint32_t samplingRate, uint32_t format, uint32_t channelMask, - audio_policy_output_flags_t flags); + audio_output_flags_t flags); // // Audio policy configuration file parsing (audio_policy.conf) // static uint32_t stringToEnum(const struct StringToEnum *table, size_t size, const char *name); - static audio_policy_output_flags_t parseFlagNames(char *name); + static audio_output_flags_t parseFlagNames(char *name); static audio_devices_t parseDeviceNames(char *name); void loadSamplingRates(char *name, IOProfile *profile); void loadFormats(char *name, IOProfile *profile); |