diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-20 14:03:58 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-20 14:03:58 -0800 |
| commit | e5198b620a9a208ec59ea8457282404725f8ff6e (patch) | |
| tree | 2ff913c152607cd9d58f0e6ba620461090be7541 /include/media | |
| parent | 54ffb8abf94365496a2dbf5d792b6977d6a8ef06 (diff) | |
| download | frameworks_av-e5198b620a9a208ec59ea8457282404725f8ff6e.zip frameworks_av-e5198b620a9a208ec59ea8457282404725f8ff6e.tar.gz frameworks_av-e5198b620a9a208ec59ea8457282404725f8ff6e.tar.bz2 | |
auto import from //branches/cupcake/...@127101
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioRecord.h | 2 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
| -rw-r--r-- | include/media/ToneGenerator.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 71744be..dd585c9 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -275,7 +275,7 @@ public: STOPPED = 1 }; - status_t obtainBuffer(Buffer* audioBuffer, bool blocking); + status_t obtainBuffer(Buffer* audioBuffer, int32_t waitCount); void releaseBuffer(Buffer* audioBuffer); diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index f382451..fd62daa 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -358,7 +358,7 @@ public: STOPPED = 1 }; - status_t obtainBuffer(Buffer* audioBuffer, bool blocking); + status_t obtainBuffer(Buffer* audioBuffer, int32_t waitCount); void releaseBuffer(Buffer* audioBuffer); diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index 0ddfb8e..0cfdeec 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -134,7 +134,7 @@ private: Condition mWaitCbkCond; // condition enabling interface to wait for audio callback completion after a change is requested float mVolume; // Volume applied to audio track int mStreamType; // Audio stream used for output - int mProcessSize; // Size of audio blocks generated at a time by audioCallback() (in PCM frames). + unsigned int mProcessSize; // Size of audio blocks generated at a time by audioCallback() (in PCM frames). bool initAudioTrack(); static void audioCallback(int event, void* user, void *info); |