diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 10:11:44 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-26 10:11:44 -0700 |
commit | c5d0343b677d5ddc2d69fd15b81b084a40ab12ac (patch) | |
tree | d2709457029d8b4cc581bba22aa13e4fa8fabd42 /media/libmedia/IAudioFlinger.cpp | |
parent | 620ad3dcf1e966bbcca3d6280fdd16f09441a733 (diff) | |
parent | de8268d6d1cd168510c490b17e93154d2eab767c (diff) | |
download | frameworks_base-c5d0343b677d5ddc2d69fd15b81b084a40ab12ac.zip frameworks_base-c5d0343b677d5ddc2d69fd15b81b084a40ab12ac.tar.gz frameworks_base-c5d0343b677d5ddc2d69fd15b81b084a40ab12ac.tar.bz2 |
am de8268d6: Merge change 2331 into donut
Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c'
* commit 'de8268d6d1cd168510c490b17e93154d2eab767c':
Fix issue 1846343 - part 1
Diffstat (limited to 'media/libmedia/IAudioFlinger.cpp')
-rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 7395885..09f1c36 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -99,7 +99,7 @@ public: virtual sp<IAudioRecord> openRecord( pid_t pid, - int streamType, + int inputSource, uint32_t sampleRate, int format, int channelCount, @@ -110,7 +110,7 @@ public: Parcel data, reply; data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor()); data.writeInt32(pid); - data.writeInt32(streamType); + data.writeInt32(inputSource); data.writeInt32(sampleRate); data.writeInt32(format); data.writeInt32(channelCount); @@ -384,14 +384,14 @@ status_t BnAudioFlinger::onTransact( case OPEN_RECORD: { CHECK_INTERFACE(IAudioFlinger, data, reply); pid_t pid = data.readInt32(); - int streamType = data.readInt32(); + int inputSource = data.readInt32(); uint32_t sampleRate = data.readInt32(); int format = data.readInt32(); int channelCount = data.readInt32(); size_t bufferCount = data.readInt32(); uint32_t flags = data.readInt32(); status_t status; - sp<IAudioRecord> record = openRecord(pid, streamType, + sp<IAudioRecord> record = openRecord(pid, inputSource, sampleRate, format, channelCount, bufferCount, flags, &status); reply->writeInt32(status); reply->writeStrongBinder(record->asBinder()); |