diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-10-10 16:36:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 16:36:04 -0700 |
commit | 0f95fadb8a3ee402f2c51a932a06f1f685ab2d35 (patch) | |
tree | 9ca9478a5391a897d5283f85f0873f35abc284da /services | |
parent | f52309555013e9909b248374f96d22dae29f6454 (diff) | |
parent | 7e2c0a15bb8086460070811a152029726479a297 (diff) | |
download | frameworks_av-0f95fadb8a3ee402f2c51a932a06f1f685ab2d35.zip frameworks_av-0f95fadb8a3ee402f2c51a932a06f1f685ab2d35.tar.gz frameworks_av-0f95fadb8a3ee402f2c51a932a06f1f685ab2d35.tar.bz2 |
am 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '7e2c0a15bb8086460070811a152029726479a297':
Support querying active record sources
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 12 | ||||
-rw-r--r-- | services/audioflinger/AudioPolicyService.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 155a0b8..8b99bd2 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -483,6 +483,18 @@ bool AudioPolicyService::isStreamActive(audio_stream_type_t stream, uint32_t inP return mpAudioPolicy->is_stream_active(mpAudioPolicy, stream, inPastMs); } +bool AudioPolicyService::isSourceActive(audio_source_t source) const +{ + if (mpAudioPolicy == NULL) { + return false; + } + if (mpAudioPolicy->is_source_active == 0) { + return false; + } + Mutex::Autolock _l(mLock); + return mpAudioPolicy->is_source_active(mpAudioPolicy, source); +} + status_t AudioPolicyService::queryDefaultPreProcessing(int audioSession, effect_descriptor_t *descriptors, uint32_t *count) diff --git a/services/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h index a086734..63f9549 100644 --- a/services/audioflinger/AudioPolicyService.h +++ b/services/audioflinger/AudioPolicyService.h @@ -104,6 +104,7 @@ public: virtual status_t unregisterEffect(int id); virtual status_t setEffectEnabled(int id, bool enabled); virtual bool isStreamActive(audio_stream_type_t stream, uint32_t inPastMs = 0) const; + virtual bool isSourceActive(audio_source_t source) const; virtual status_t queryDefaultPreProcessing(int audioSession, effect_descriptor_t *descriptors, |