diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-16 13:56:12 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-16 13:56:12 -0400 |
commit | f7bf754e5040987a25b056d34788136c179b8298 (patch) | |
tree | 960dffa10f2f5c1d4930f1f907b0a832ccd0a629 | |
parent | 3e36bfc7211e1dd4b018003971da8cec1e9b0f8d (diff) | |
parent | bdc0f84793a3586ee67c3ca3d1d322cf9ad69bfb (diff) | |
download | frameworks_native-f7bf754e5040987a25b056d34788136c179b8298.zip frameworks_native-f7bf754e5040987a25b056d34788136c179b8298.tar.gz frameworks_native-f7bf754e5040987a25b056d34788136c179b8298.tar.bz2 |
Merge change 25265 into eclair
* changes:
Fix issue 2123668: Class scope typo in AudioFlinger.cpp.
-rw-r--r-- | libs/audioflinger/AudioFlinger.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index 4f7500f..add358b 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -2069,7 +2069,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( } } -AudioFlinger::PlaybackThread::TrackBase::~TrackBase() +AudioFlinger::ThreadBase::TrackBase::~TrackBase() { if (mCblk) { mCblk->~audio_track_cblk_t(); // destroy our shared-structure. @@ -2081,7 +2081,7 @@ AudioFlinger::PlaybackThread::TrackBase::~TrackBase() mClient.clear(); } -void AudioFlinger::PlaybackThread::TrackBase::releaseBuffer(AudioBufferProvider::Buffer* buffer) +void AudioFlinger::ThreadBase::TrackBase::releaseBuffer(AudioBufferProvider::Buffer* buffer) { buffer->raw = 0; mFrameCount = buffer->frameCount; @@ -2089,7 +2089,7 @@ void AudioFlinger::PlaybackThread::TrackBase::releaseBuffer(AudioBufferProvider: buffer->frameCount = 0; } -bool AudioFlinger::PlaybackThread::TrackBase::step() { +bool AudioFlinger::ThreadBase::TrackBase::step() { bool result; audio_track_cblk_t* cblk = this->cblk(); @@ -2101,7 +2101,7 @@ bool AudioFlinger::PlaybackThread::TrackBase::step() { return result; } -void AudioFlinger::PlaybackThread::TrackBase::reset() { +void AudioFlinger::ThreadBase::TrackBase::reset() { audio_track_cblk_t* cblk = this->cblk(); cblk->user = 0; @@ -2112,20 +2112,20 @@ void AudioFlinger::PlaybackThread::TrackBase::reset() { LOGV("TrackBase::reset"); } -sp<IMemory> AudioFlinger::PlaybackThread::TrackBase::getCblk() const +sp<IMemory> AudioFlinger::ThreadBase::TrackBase::getCblk() const { return mCblkMemory; } -int AudioFlinger::PlaybackThread::TrackBase::sampleRate() const { +int AudioFlinger::ThreadBase::TrackBase::sampleRate() const { return (int)mCblk->sampleRate; } -int AudioFlinger::PlaybackThread::TrackBase::channelCount() const { +int AudioFlinger::ThreadBase::TrackBase::channelCount() const { return (int)mCblk->channels; } -void* AudioFlinger::PlaybackThread::TrackBase::getBuffer(uint32_t offset, uint32_t frames) const { +void* AudioFlinger::ThreadBase::TrackBase::getBuffer(uint32_t offset, uint32_t frames) const { audio_track_cblk_t* cblk = this->cblk(); int8_t *bufferStart = (int8_t *)mBuffer + (offset-cblk->serverBase)*cblk->frameSize; int8_t *bufferEnd = bufferStart + frames * cblk->frameSize; |