diff options
| author | Eric Laurent <elaurent@google.com> | 2009-11-21 00:26:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-21 00:26:09 -0800 |
| commit | aadb854e0bc63547c0d4b4129330a49917a30f75 (patch) | |
| tree | 2782ab633775e51dcf949421fe5d74dee7da9588 /include | |
| parent | 317599076b653bffb9142a98c6bb4f887804f231 (diff) | |
| parent | bf89c099fc97717e3008a481aeddc76c1ac5e00d (diff) | |
| download | frameworks_av-aadb854e0bc63547c0d4b4129330a49917a30f75.zip frameworks_av-aadb854e0bc63547c0d4b4129330a49917a30f75.tar.gz frameworks_av-aadb854e0bc63547c0d4b4129330a49917a30f75.tar.bz2 | |
am 949c572a: am e7800946: Merge change I49f02be9 into eclair
Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp
* commit '949c572a16881aa40079a42bf7682637b23eb16a':
Issue 2265163: Audio still reported routed through earpiece on sholes
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 008468c..622c596 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -268,7 +268,7 @@ public: * Returned value: * handle on audio hardware input */ - audio_io_handle_t getInput() { return mInput; } + audio_io_handle_t getInput(); /* obtains a buffer of "frameCount" frames. The buffer must be * filled entirely. If the track is stopped, obtainBuffer() returns @@ -318,7 +318,8 @@ private: int format, int channelCount, int frameCount, - uint32_t flags); + uint32_t flags, + audio_io_handle_t input); sp<IAudioRecord> mAudioRecord; sp<IMemory> mCblkMemory; @@ -345,8 +346,8 @@ private: bool mMarkerReached; uint32_t mNewPosition; uint32_t mUpdatePeriod; - audio_io_handle_t mInput; uint32_t mFlags; + uint32_t mChannels; }; }; // namespace android |