summaryrefslogtreecommitdiff
path: root/include/media/AudioSystem.h
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2010-01-25 08:49:09 -0800
committer Eric Laurent <elaurent@google.com> 2010-01-25 14:00:10 -0800
commit23f25cda0c73f8eb878844dea32fb0bd419edca2 (patch)
treec1945d31c382864db8da0b829ccb017d2c31bbd6 /include/media/AudioSystem.h
parentbb04b631b60e0286c02e0fd4dd7ab764a001e0ce (diff)
Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.
Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream type is playing. Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
Diffstat (limited to 'include/media/AudioSystem.h')
-rw-r--r--include/media/AudioSystem.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index f935bb92cd73..b42bf5477f7b 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -194,8 +194,8 @@ public:
// set audio mode in audio hardware (see AudioSystem::audio_mode)
static status_t setMode(int mode);
- // returns true if tracks are active on AudioSystem::MUSIC stream
- static status_t isMusicActive(bool *state);
+ // returns true in *state if tracks are active on the specified stream
+ static status_t isStreamActive(int stream, bool *state);
// set/get audio hardware parameters. The function accepts a list of parameters
// key value pairs in the form: key1=value1;key2=value2;...