diff options
| author | Eric Laurent <elaurent@google.com> | 2015-05-01 19:10:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 19:10:26 +0000 |
| commit | cc85abcf4ac398dca240db356b8b4db052b415a4 (patch) | |
| tree | 65f9eccab6b0d9b9f3dcee48e2c44326b0edbef4 /services/audioflinger/AudioFlinger.h | |
| parent | 0bbf8b213ad96051357e3ad6d6d2808bfa31a59a (diff) | |
| parent | 73e26b661af50be2c0a4ff6c9ac85f7347a8b235 (diff) | |
| download | frameworks_av-cc85abcf4ac398dca240db356b8b4db052b415a4.zip frameworks_av-cc85abcf4ac398dca240db356b8b4db052b415a4.tar.gz frameworks_av-cc85abcf4ac398dca240db356b8b4db052b415a4.tar.bz2 | |
Merge "AudioSystem: refactor audio config cache and callbacks" into mnc-dev
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 34ec2b1..8085ec2 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -545,7 +545,8 @@ 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(int event, audio_io_handle_t ioHandle, const void *param2); + void ioConfigChanged(audio_io_config_event event, + const sp<AudioIoDescriptor>& ioDesc); // 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 |