From 316222fcd60a429e53aa6205278697bb2df8ef32 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 3 Feb 2014 08:46:13 -0800 Subject: Rename setStreamOutput to invalidateStream And simplify by removing the unused I/O handle parameter 'output'. Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e --- audio/AudioPolicyCompatClient.cpp | 6 ++---- audio/AudioPolicyCompatClient.h | 2 +- audio/AudioPolicyManagerBase.cpp | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'audio') diff --git a/audio/AudioPolicyCompatClient.cpp b/audio/AudioPolicyCompatClient.cpp index 162968c..9d02d98 100644 --- a/audio/AudioPolicyCompatClient.cpp +++ b/audio/AudioPolicyCompatClient.cpp @@ -85,11 +85,9 @@ status_t AudioPolicyCompatClient::closeInput(audio_io_handle_t input) return mServiceOps->close_input(mService, input); } -status_t AudioPolicyCompatClient::setStreamOutput(AudioSystem::stream_type stream, - audio_io_handle_t output) +status_t AudioPolicyCompatClient::invalidateStream(AudioSystem::stream_type stream) { - return mServiceOps->set_stream_output(mService, (audio_stream_type_t)stream, - output); + return mServiceOps->invalidate_stream(mService, (audio_stream_type_t)stream); } status_t AudioPolicyCompatClient::moveEffects(int session, audio_io_handle_t srcOutput, diff --git a/audio/AudioPolicyCompatClient.h b/audio/AudioPolicyCompatClient.h index 494c8af..19f76e1 100644 --- a/audio/AudioPolicyCompatClient.h +++ b/audio/AudioPolicyCompatClient.h @@ -56,7 +56,7 @@ public: audio_format_t *pFormat, audio_channel_mask_t *pChannelMask); virtual status_t closeInput(audio_io_handle_t input); - virtual status_t setStreamOutput(AudioSystem::stream_type stream, audio_io_handle_t output); + virtual status_t invalidateStream(AudioSystem::stream_type stream); virtual status_t moveEffects(int session, audio_io_handle_t srcOutput, audio_io_handle_t dstOutput); diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 8be4390..26d9395 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -2143,9 +2143,7 @@ void AudioPolicyManagerBase::checkOutputForStrategy(routing_strategy strategy) // Move tracks associated to this strategy from previous output to new output for (int i = 0; i < (int)AudioSystem::NUM_STREAM_TYPES; i++) { if (getStrategy((AudioSystem::stream_type)i) == strategy) { - //FIXME see fixme on name change - mpClientInterface->setStreamOutput((AudioSystem::stream_type)i, - dstOutputs[0] /* ignored */); + mpClientInterface->invalidateStream((AudioSystem::stream_type)i); } } } -- cgit v1.1