diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-20 09:37:45 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-27 16:33:43 -0800 |
| commit | 211eeaf17e5565b68447d29799dbf158a33cf4cf (patch) | |
| tree | 5b309757ae12403d5edd39f7e7d99cc3b405766c /media/libmedia/AudioSystem.cpp | |
| parent | fd267d7cf640225bb57f0ed1af44efc153275f6d (diff) | |
| download | frameworks_av-211eeaf17e5565b68447d29799dbf158a33cf4cf.zip frameworks_av-211eeaf17e5565b68447d29799dbf158a33cf4cf.tar.gz frameworks_av-211eeaf17e5565b68447d29799dbf158a33cf4cf.tar.bz2 | |
More audio_stream_type_t
Change-Id: I1260259efe0aa3fc1ef13de69758aaa592e1f815
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 124032b..df5017b 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -35,7 +35,8 @@ sp<IAudioFlinger> AudioSystem::gAudioFlinger; sp<AudioSystem::AudioFlingerClient> AudioSystem::gAudioFlingerClient; audio_error_callback AudioSystem::gAudioErrorCallback = NULL; // Cached values -DefaultKeyedVector<int, audio_io_handle_t> AudioSystem::gStreamOutputMap(0); + +DefaultKeyedVector<audio_stream_type_t, audio_io_handle_t> AudioSystem::gStreamOutputMap(0); DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSystem::gOutputs(0); // Cached values for recording queries, all protected by gLock @@ -404,7 +405,7 @@ void AudioSystem::AudioFlingerClient::binderDied(const wp<IBinder>& who) { void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, int ioHandle, void *param2) { ALOGV("ioConfigChanged() event %d", event); OutputDescriptor *desc; - uint32_t stream; + audio_stream_type_t stream; if (ioHandle == 0) return; @@ -413,7 +414,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, int ioHandle, v switch (event) { case STREAM_CONFIG_CHANGED: if (param2 == 0) break; - stream = *(uint32_t *)param2; + stream = *(audio_stream_type_t *)param2; ALOGV("ioConfigChanged() STREAM_CONFIG_CHANGED stream %d, output %d", stream, ioHandle); if (gStreamOutputMap.indexOfKey(stream) >= 0) { gStreamOutputMap.replaceValueFor(stream, ioHandle); |