From 23f25cda0c73f8eb878844dea32fb0bd419edca2 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Mon, 25 Jan 2010 08:49:09 -0800 Subject: 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. --- include/media/AudioSystem.h | 4 ++-- include/media/IAudioFlinger.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') 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;... diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index a46c72774f31..b689dcbc1d2e 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -97,8 +97,8 @@ public: virtual status_t setMicMute(bool state) = 0; virtual bool getMicMute() const = 0; - // is a music stream active? - virtual bool isMusicActive() 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; -- cgit v1.2.3-59-g8ed1b