diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioHardwareInterface.h | 5 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyInterface.h | 12 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 2 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioSystemLegacy.h | 4 |
4 files changed, 10 insertions, 13 deletions
diff --git a/include/hardware_legacy/AudioHardwareInterface.h b/include/hardware_legacy/AudioHardwareInterface.h index 847fe6b..c781218 100644 --- a/include/hardware_legacy/AudioHardwareInterface.h +++ b/include/hardware_legacy/AudioHardwareInterface.h @@ -56,7 +56,7 @@ public: virtual size_t bufferSize() const = 0; /** - * returns the output channel nask + * returns the output channel mask */ virtual uint32_t channels() const = 0; @@ -166,7 +166,7 @@ public: virtual String8 getParameters(const String8& keys) = 0; - // Return the amount of input frames lost in the audio driver since the last call of this function. + // Return the number of input frames lost in the audio driver since the last call of this function. // Audio driver is expected to reset the value to 0 and restart counting upon returning the current value by this function call. // Such loss typically occurs when the user space process is blocked longer than the capacity of audio driver buffers. // Unit: the number of input audio frames @@ -236,6 +236,7 @@ public: uint32_t *sampleRate=0, status_t *status=0) = 0; virtual void closeOutputStream(AudioStreamOut* out) = 0; + /** This method creates and opens the audio hardware input stream */ virtual AudioStreamIn* openInputStream( uint32_t devices, diff --git a/include/hardware_legacy/AudioPolicyInterface.h b/include/hardware_legacy/AudioPolicyInterface.h index a1c1fd5..f283594 100644 --- a/include/hardware_legacy/AudioPolicyInterface.h +++ b/include/hardware_legacy/AudioPolicyInterface.h @@ -69,16 +69,14 @@ public: virtual status_t setDeviceConnectionState(AudioSystem::audio_devices device, AudioSystem::device_connection_state state, const char *device_address) = 0; - // retreive a device connection status + // retrieve a device connection status virtual AudioSystem::device_connection_state getDeviceConnectionState(AudioSystem::audio_devices device, const char *device_address) = 0; // indicate a change in phone state. Valid phones states are defined by AudioSystem::audio_mode virtual void setPhoneState(int state) = 0; - // indicate a change in ringer mode - virtual void setRingerMode(uint32_t mode, uint32_t mask) = 0; // force using a specific device category for the specified usage virtual void setForceUse(AudioSystem::force_use usage, AudioSystem::forced_config config) = 0; - // retreive current device category forced for a given usage + // retrieve current device category forced for a given usage virtual AudioSystem::forced_config getForceUse(AudioSystem::force_use usage) = 0; // set a system property (e.g. camera sound always audible) virtual void setSystemProperty(const char* property, const char* value) = 0; @@ -89,7 +87,7 @@ public: // Audio routing query functions // - // request an output appriate for playback of the supplied stream type and parameters + // 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, @@ -106,7 +104,7 @@ public: // releases the output. virtual void releaseOutput(audio_io_handle_t output) = 0; - // request an input appriate for record from the supplied device with supplied parameters. + // 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, @@ -205,7 +203,7 @@ public: uint32_t *pSamplingRate, uint32_t *pFormat, uint32_t *pChannels, - uint32_t acoustics) = 0; + audio_in_acoustics_t acoustics) = 0; // closes an audio input virtual status_t closeInput(audio_io_handle_t input) = 0; // diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 24368e3..2a37200 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -70,7 +70,6 @@ public: virtual AudioSystem::device_connection_state getDeviceConnectionState(AudioSystem::audio_devices device, const char *device_address); virtual void setPhoneState(int state); - virtual void setRingerMode(uint32_t mode, uint32_t mask); virtual void setForceUse(AudioSystem::force_use usage, AudioSystem::forced_config config); virtual AudioSystem::forced_config getForceUse(AudioSystem::force_use usage); virtual void setSystemProperty(const char* property, const char* value); @@ -357,7 +356,6 @@ protected: uint32_t mAvailableOutputDevices; // bit field of all available output devices uint32_t mAvailableInputDevices; // bit field of all available input devices int mPhoneState; // current phone state - uint32_t mRingerMode; // current ringer mode AudioSystem::forced_config mForceUse[AudioSystem::NUM_FORCE_USE]; // current forced use configuration StreamDescriptor mStreams[AudioSystem::NUM_STREAM_TYPES]; // stream descriptors for volume control diff --git a/include/hardware_legacy/AudioSystemLegacy.h b/include/hardware_legacy/AudioSystemLegacy.h index 4b78f58..6d90896 100644 --- a/include/hardware_legacy/AudioSystemLegacy.h +++ b/include/hardware_legacy/AudioSystemLegacy.h @@ -332,10 +332,10 @@ public: return audio_is_low_visibility((audio_stream_type_t)stream); } static bool isValidFormat(uint32_t format) { - return audio_is_valid_format(format); + return audio_is_valid_format((audio_format_t) format); } static bool isLinearPCM(uint32_t format) { - return audio_is_linear_pcm(format); + return audio_is_linear_pcm((audio_format_t) format); } static bool isOutputChannel(uint32_t channel) { return audio_is_output_channel(channel); |