diff options
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index db81ff0..92ee30e 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1940,10 +1940,10 @@ status_t AudioFlinger::closeInput_nonvirtual(audio_io_handle_t input) return NO_ERROR; } -status_t AudioFlinger::setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output) +status_t AudioFlinger::invalidateStream(audio_stream_type_t stream) { Mutex::Autolock _l(mLock); - ALOGV("setStreamOutput() stream %d to output %d", stream, output); + ALOGV("invalidateStream() stream %d", stream); for (size_t i = 0; i < mPlaybackThreads.size(); i++) { PlaybackThread *thread = mPlaybackThreads.valueAt(i).get(); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 21d05d4..c2b516b 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -182,7 +182,7 @@ public: virtual status_t closeInput(audio_io_handle_t input); - virtual status_t setStreamOutput(audio_stream_type_t stream, audio_io_handle_t output); + virtual status_t invalidateStream(audio_stream_type_t stream); virtual status_t setVoiceVolume(float volume); diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 9980344..41bd990 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -1598,15 +1598,14 @@ static int aps_close_input(void *service __unused, audio_io_handle_t input) return af->closeInput(input); } -static int aps_set_stream_output(void *service __unused, audio_stream_type_t stream, - audio_io_handle_t output) +static int aps_invalidate_stream(void *service __unused, audio_stream_type_t stream) { sp<IAudioFlinger> af = AudioSystem::get_audio_flinger(); if (af == 0) { return PERMISSION_DENIED; } - return af->setStreamOutput(stream, output); + return af->invalidateStream(stream); } static int aps_move_effects(void *service __unused, int session, @@ -1680,7 +1679,7 @@ namespace { .open_input = aps_open_input, .close_input = aps_close_input, .set_stream_volume = aps_set_stream_volume, - .set_stream_output = aps_set_stream_output, + .invalidate_stream = aps_invalidate_stream, .set_parameters = aps_set_parameters, .get_parameters = aps_get_parameters, .start_tone = aps_start_tone, |