diff options
author | Eric Laurent <elaurent@google.com> | 2014-05-09 23:18:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-09 23:18:48 +0000 |
commit | 26d5ff926fa3323b39ae4408bcd29826a9523c9b (patch) | |
tree | 6abb6b28dfeffa2f5c602d350021dd8b4e6bd460 /services/audioflinger/AudioFlinger.h | |
parent | 16821ec9e1619f4edcc87f21ea1537580109b14d (diff) | |
parent | 1035194cee4fbd57e35ea15c56e66cd09b63d56e (diff) | |
download | frameworks_av-26d5ff926fa3323b39ae4408bcd29826a9523c9b.zip frameworks_av-26d5ff926fa3323b39ae4408bcd29826a9523c9b.tar.gz frameworks_av-26d5ff926fa3323b39ae4408bcd29826a9523c9b.tar.bz2 |
Merge "audioflinger: refactor thread config events"
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 462f9e2..e0965b8 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -454,7 +454,11 @@ private: // no range check, doesn't check per-thread stream volume, AudioFlinger::mLock held float streamVolume_l(audio_stream_type_t stream) const { return mStreamTypes[stream].volume; } - void audioConfigChanged_l(int event, audio_io_handle_t ioHandle, const void *param2); + void audioConfigChanged_l(const DefaultKeyedVector< pid_t,sp<NotificationClient> >& + notificationClients, + int event, + audio_io_handle_t ioHandle, + const void *param2); // Allocate an audio_io_handle_t, session ID, effect ID, or audio_module_handle_t. // They all share the same ID space, but the namespaces are actually independent @@ -479,7 +483,8 @@ private: void removeClient_l(pid_t pid); void removeNotificationClient(pid_t pid); - + DefaultKeyedVector< pid_t,sp<NotificationClient> > notificationClients() { + Mutex::Autolock _l(mLock); return mNotificationClients; } bool isNonOffloadableGlobalEffectEnabled_l(); void onNonOffloadableGlobalEffectEnable(); |