diff options
| author | Eric Laurent <elaurent@google.com> | 2011-02-03 10:28:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-03 10:28:24 -0800 |
| commit | 1bca832a1e023988a0103e3d87a47c96bfa0045a (patch) | |
| tree | 4b705e0ba38d5db0b40a6b9e155e77f204b21dcc /include | |
| parent | 4e5391cf782ddff9a1c0d9b8211f1252521ca598 (diff) | |
| parent | eda6c364c253ba97ee45a3adeb8c2b45db1f81db (diff) | |
| download | frameworks_av-1bca832a1e023988a0103e3d87a47c96bfa0045a.zip frameworks_av-1bca832a1e023988a0103e3d87a47c96bfa0045a.tar.gz frameworks_av-1bca832a1e023988a0103e3d87a47c96bfa0045a.tar.bz2 | |
am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
Fix issue 3371080
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 5 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 3 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 1e29d82..03f8944 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -204,8 +204,9 @@ public: // set audio mode in audio hardware (see AudioSystem::audio_mode) static status_t setMode(int mode); - // returns true in *state if tracks are active on the specified stream - static status_t isStreamActive(int stream, bool *state); + // returns true in *state if tracks are active on the specified stream or has been active + // in the past inPastMs milliseconds + static status_t isStreamActive(int stream, bool *state, uint32_t inPastMs = 0); // set/get audio hardware parameters. The function accepts a list of parameters // key value pairs in the form: key1=value1;key2=value2;... diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 70e505e..589f7cd 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -102,9 +102,6 @@ public: virtual status_t setMicMute(bool state) = 0; virtual bool getMicMute() const = 0; - // is any track active on this stream? - virtual bool isStreamActive(int stream) const = 0; - virtual status_t setParameters(int ioHandle, const String8& keyValuePairs) = 0; virtual String8 getParameters(int ioHandle, const String8& keys) = 0; diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 49eee59..5afceaa 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -81,6 +81,7 @@ public: int session, int id) = 0; virtual status_t unregisterEffect(int id) = 0; + virtual bool isStreamActive(int stream, uint32_t inPastMs = 0) const = 0; }; |