diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-07 16:08:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:08:59 -0800 |
| commit | 78c914f37a9891bc24f335fcf8c628beeb9310f5 (patch) | |
| tree | 6cc1271be0fe862e6e9997a2a32b58a0747e296d /media/libmedia/IAudioFlingerClient.cpp | |
| parent | ac3c33745f1a8b2153688903494522ed956027df (diff) | |
| parent | ffed04ac3c1dd01d66b3e96ec1314173309e7415 (diff) | |
| download | frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.zip frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.tar.gz frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.tar.bz2 | |
Merge "IAudioFlingerClient::ioConfigChanged param2 const"
Diffstat (limited to 'media/libmedia/IAudioFlingerClient.cpp')
| -rw-r--r-- | media/libmedia/IAudioFlingerClient.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/IAudioFlingerClient.cpp b/media/libmedia/IAudioFlingerClient.cpp index ce28b33..1db39a3 100644 --- a/media/libmedia/IAudioFlingerClient.cpp +++ b/media/libmedia/IAudioFlingerClient.cpp @@ -39,18 +39,18 @@ public: { } - void ioConfigChanged(int event, audio_io_handle_t ioHandle, void *param2) + void ioConfigChanged(int event, audio_io_handle_t ioHandle, const void *param2) { Parcel data, reply; data.writeInterfaceToken(IAudioFlingerClient::getInterfaceDescriptor()); data.writeInt32(event); data.writeInt32((int32_t) ioHandle); if (event == AudioSystem::STREAM_CONFIG_CHANGED) { - uint32_t stream = *(uint32_t *)param2; + uint32_t stream = *(const uint32_t *)param2; ALOGV("ioConfigChanged stream %d", stream); data.writeInt32(stream); } else if (event != AudioSystem::OUTPUT_CLOSED && event != AudioSystem::INPUT_CLOSED) { - AudioSystem::OutputDescriptor *desc = (AudioSystem::OutputDescriptor *)param2; + const AudioSystem::OutputDescriptor *desc = (const AudioSystem::OutputDescriptor *)param2; data.writeInt32(desc->samplingRate); data.writeInt32(desc->format); data.writeInt32(desc->channels); @@ -73,7 +73,7 @@ status_t BnAudioFlingerClient::onTransact( CHECK_INTERFACE(IAudioFlingerClient, data, reply); int event = data.readInt32(); audio_io_handle_t ioHandle = (audio_io_handle_t) data.readInt32(); - void *param2 = NULL; + const void *param2 = NULL; AudioSystem::OutputDescriptor desc; uint32_t stream; if (event == AudioSystem::STREAM_CONFIG_CHANGED) { |