diff options
author | Eric Laurent <elaurent@google.com> | 2009-10-24 01:38:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-24 01:38:49 -0700 |
commit | 0c4ba3e1a4a10d804b59eaf7d66646107f4821b3 (patch) | |
tree | 91e01bd8a619cd92f08cdfeea46786c494a08601 /include | |
parent | 53793c267e7abbf09389ecb33130f8bc7893a16c (diff) | |
parent | bf96aaadd46fb5b0884070177faa16ec4f22e2ba (diff) | |
download | frameworks_base-0c4ba3e1a4a10d804b59eaf7d66646107f4821b3.zip frameworks_base-0c4ba3e1a4a10d804b59eaf7d66646107f4821b3.tar.gz frameworks_base-0c4ba3e1a4a10d804b59eaf7d66646107f4821b3.tar.bz2 |
am bf96aaad: Merge change Icf10db28 into eclair
Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-plus-aosp
* commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Diffstat (limited to 'include')
-rw-r--r-- | include/media/AudioSystem.h | 1 | ||||
-rw-r--r-- | include/media/IAudioFlinger.h | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 57f8102..a7c8a0a 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -220,6 +220,7 @@ public: static status_t getInputBufferSize(uint32_t sampleRate, int format, int channelCount, size_t* buffSize); + static status_t setVoiceVolume(float volume); // // AudioPolicyService interface diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 8018568..a46c727 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -102,10 +102,10 @@ public: virtual status_t setParameters(int ioHandle, const String8& keyValuePairs) = 0; virtual String8 getParameters(int ioHandle, const String8& keys) = 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, int format, int channelCount) = 0; @@ -128,6 +128,8 @@ public: virtual status_t closeInput(int input) = 0; virtual status_t setStreamOutput(uint32_t stream, int output) = 0; + + virtual status_t setVoiceVolume(float volume) = 0; }; |