diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-12-10 09:53:22 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-12-10 10:06:28 -0800 |
| commit | 5082dbeb19e37883230510129c94336063a4f91c (patch) | |
| tree | f075b035aff4f6d2cc95e2f3a3e4dba32843e388 /include | |
| parent | ce3e7680ccaa71337657591e8b10707233fc67b0 (diff) | |
| download | hardware_libhardware_legacy-5082dbeb19e37883230510129c94336063a4f91c.zip hardware_libhardware_legacy-5082dbeb19e37883230510129c94336063a4f91c.tar.gz hardware_libhardware_legacy-5082dbeb19e37883230510129c94336063a4f91c.tar.bz2 | |
Use audio_format_t in AudioPolicy
Also remove unnecessary default parameters
Change-Id: I553c01a98b8c2a3f3fd2ac98724aded3ad3c3022
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyInterface.h | 19 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 19 |
2 files changed, 18 insertions, 20 deletions
diff --git a/include/hardware_legacy/AudioPolicyInterface.h b/include/hardware_legacy/AudioPolicyInterface.h index 7847bdd..927fe6d 100644 --- a/include/hardware_legacy/AudioPolicyInterface.h +++ b/include/hardware_legacy/AudioPolicyInterface.h @@ -90,12 +90,11 @@ public: // request an output appropriate for playback of the supplied stream type and parameters virtual audio_io_handle_t getOutput(AudioSystem::stream_type stream, - uint32_t samplingRate = 0, - uint32_t format = AudioSystem::FORMAT_DEFAULT, - uint32_t channels = 0, - AudioSystem::output_flags flags = - AudioSystem::OUTPUT_FLAG_INDIRECT, - const audio_offload_info_t *offloadInfo = NULL) = 0; + uint32_t samplingRate, + audio_format_t format, + uint32_t channels, + AudioSystem::output_flags flags, + const audio_offload_info_t *offloadInfo) = 0; // indicates to the audio policy manager that the output starts being used by corresponding stream. virtual status_t startOutput(audio_io_handle_t output, AudioSystem::stream_type stream, @@ -109,10 +108,10 @@ public: // request an input appropriate for record from the supplied device with supplied parameters. virtual audio_io_handle_t getInput(int inputSource, - uint32_t samplingRate = 0, - uint32_t Format = AudioSystem::FORMAT_DEFAULT, - uint32_t channels = 0, - AudioSystem::audio_in_acoustics acoustics = (AudioSystem::audio_in_acoustics)0) = 0; + uint32_t samplingRate, + audio_format_t format, + uint32_t channels, + AudioSystem::audio_in_acoustics acoustics) = 0; // indicates to the audio policy manager that the input starts being used. virtual status_t startInput(audio_io_handle_t input) = 0; // indicates to the audio policy manager that the input stops being used. diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 8343f2b..84fb30e 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -87,12 +87,11 @@ public: virtual void setSystemProperty(const char* property, const char* value); virtual status_t initCheck(); virtual audio_io_handle_t getOutput(AudioSystem::stream_type stream, - uint32_t samplingRate = 0, - uint32_t format = AudioSystem::FORMAT_DEFAULT, - uint32_t channels = 0, - AudioSystem::output_flags flags = - AudioSystem::OUTPUT_FLAG_INDIRECT, - const audio_offload_info_t *offloadInfo = NULL); + uint32_t samplingRate, + audio_format_t format, + uint32_t channels, + AudioSystem::output_flags flags, + const audio_offload_info_t *offloadInfo); virtual status_t startOutput(audio_io_handle_t output, AudioSystem::stream_type stream, int session = 0); @@ -102,7 +101,7 @@ public: virtual void releaseOutput(audio_io_handle_t output); virtual audio_io_handle_t getInput(int inputSource, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channels, AudioSystem::audio_in_acoustics acoustics); @@ -209,7 +208,7 @@ protected: bool isCompatibleProfile(audio_devices_t device, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, audio_output_flags_t flags) const; @@ -483,11 +482,11 @@ protected: AudioSystem::output_flags flags); IOProfile *getInputProfile(audio_devices_t device, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask); IOProfile *getProfileForDirectOutput(audio_devices_t device, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channelMask, audio_output_flags_t flags); |