summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-10-10 17:23:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 17:23:19 -0700
commitb9c24111ecc135d47d563eaa3609730b6b4ee5e0 (patch)
tree0222bb760921fc560e4692be37bcb04c6cc66c30 /include
parent142dbcfe437524bc0e8d546d2d43cab2a3ea625b (diff)
parentf84ae1292bc9a6a727ab5aeb08e097054b7d4b5a (diff)
downloadframeworks_av-b9c24111ecc135d47d563eaa3609730b6b4ee5e0.zip
frameworks_av-b9c24111ecc135d47d563eaa3609730b6b4ee5e0.tar.gz
frameworks_av-b9c24111ecc135d47d563eaa3609730b6b4ee5e0.tar.bz2
am 0f95fadb: am 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '0f95fadb8a3ee402f2c51a932a06f1f685ab2d35': Support querying active record sources
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioSystem.h2
-rw-r--r--include/media/IAudioPolicyService.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index da4645a..49e1afc 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -70,6 +70,8 @@ public:
// 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(audio_stream_type_t stream, bool *state, uint32_t inPastMs = 0);
+ // returns true in *state if a recorder is currently recording with the specified source
+ static status_t isSourceActive(audio_source_t source, bool *state);
// 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/IAudioPolicyService.h b/include/media/IAudioPolicyService.h
index fb556af..cc2e069 100644
--- a/include/media/IAudioPolicyService.h
+++ b/include/media/IAudioPolicyService.h
@@ -88,6 +88,7 @@ public:
virtual status_t unregisterEffect(int id) = 0;
virtual status_t setEffectEnabled(int id, bool enabled) = 0;
virtual bool isStreamActive(audio_stream_type_t stream, uint32_t inPastMs = 0) const = 0;
+ virtual bool isSourceActive(audio_source_t source) const = 0;
virtual status_t queryDefaultPreProcessing(int audioSession,
effect_descriptor_t *descriptors,
uint32_t *count) = 0;