diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-08 07:39:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 07:39:27 -0800 |
| commit | e98bbd36d67243fe987b09904956550a68af1cc7 (patch) | |
| tree | 3ad396f50bb4ad8e1bbf9fa939c4978851ec998b /include/media | |
| parent | dfa75555098a385ac8f4d29a73b32d66501f133d (diff) | |
| parent | f587ba5b991c7cd91e4df093d0d796bd419e5d67 (diff) | |
| download | frameworks_av-e98bbd36d67243fe987b09904956550a68af1cc7.zip frameworks_av-e98bbd36d67243fe987b09904956550a68af1cc7.tar.gz frameworks_av-e98bbd36d67243fe987b09904956550a68af1cc7.tar.bz2 | |
Merge "Declare more IAudioFlinger methods const"
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioEffect.h | 3 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/media/AudioEffect.h b/include/media/AudioEffect.h index 7b0b443..4c57ed2 100644 --- a/include/media/AudioEffect.h +++ b/include/media/AudioEffect.h @@ -108,7 +108,8 @@ public: * Returned value * *descriptor updated with effect descriptor */ - static status_t getEffectDescriptor(effect_uuid_t *uuid, effect_descriptor_t *descriptor); + static status_t getEffectDescriptor(effect_uuid_t *uuid, + effect_descriptor_t *descriptor) /*const*/; /* diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 760595c..ba94bad 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -103,13 +103,13 @@ public: virtual bool getMicMute() const = 0; virtual status_t setParameters(int ioHandle, const String8& keyValuePairs) = 0; - virtual String8 getParameters(int ioHandle, const String8& keys) = 0; + virtual String8 getParameters(int ioHandle, const String8& keys) const = 0; // register a current process for audio output change notifications virtual void registerClient(const sp<IAudioFlingerClient>& client) = 0; // retrieve the audio recording buffer size - virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) = 0; + virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const = 0; virtual int openOutput(uint32_t *pDevices, uint32_t *pSamplingRate, @@ -133,20 +133,21 @@ public: virtual status_t setVoiceVolume(float volume) = 0; - virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) = 0; + virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) const = 0; - virtual unsigned int getInputFramesLost(int ioHandle) = 0; + virtual unsigned int getInputFramesLost(int ioHandle) const = 0; virtual int newAudioSessionId() = 0; virtual void acquireAudioSessionId(int audioSession) = 0; virtual void releaseAudioSessionId(int audioSession) = 0; - virtual status_t queryNumberEffects(uint32_t *numEffects) = 0; + virtual status_t queryNumberEffects(uint32_t *numEffects) const = 0; - virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor) = 0; + virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor) const = 0; - virtual status_t getEffectDescriptor(effect_uuid_t *pEffectUUID, effect_descriptor_t *pDescriptor) = 0; + virtual status_t getEffectDescriptor(effect_uuid_t *pEffectUUID, + effect_descriptor_t *pDescriptor) const = 0; virtual sp<IEffect> createEffect(pid_t pid, effect_descriptor_t *pDesc, |