diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-12 09:45:18 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-30 09:24:03 -0700 |
| commit | f20e1d8df84c5fbeeace0052d100982ae39bb7a4 (patch) | |
| tree | 997cd41de1adb829c194f56cf29eb02945666b94 /media/libmedia/AudioTrackShared.cpp | |
| parent | eced2daaa6c91a3731eef978ce65c6ec319c5e6a (diff) | |
| download | frameworks_av-f20e1d8df84c5fbeeace0052d100982ae39bb7a4.zip frameworks_av-f20e1d8df84c5fbeeace0052d100982ae39bb7a4.tar.gz frameworks_av-f20e1d8df84c5fbeeace0052d100982ae39bb7a4.tar.bz2 | |
Rename control block server to mServer and add comments
Change-Id: Ieabd91acee92d0e84e66fbd358df5282b856306e
Diffstat (limited to 'media/libmedia/AudioTrackShared.cpp')
| -rw-r--r-- | media/libmedia/AudioTrackShared.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index aa45a2f..e5f7fcd 100644 --- a/media/libmedia/AudioTrackShared.cpp +++ b/media/libmedia/AudioTrackShared.cpp @@ -26,7 +26,7 @@ extern "C" { namespace android { audio_track_cblk_t::audio_track_cblk_t() - : server(0), frameCount_(0), mFutex(0), mMinimum(0), + : mServer(0), frameCount_(0), mFutex(0), mMinimum(0), mVolumeLR(0x10001000), mSampleRate(0), mSendLevel(0), mName(0), flags(0) { memset(&u, 0, sizeof(u)); @@ -594,7 +594,7 @@ void ServerProxy::releaseBuffer(Buffer* buffer) android_atomic_release_store(stepCount + rear, &cblk->u.mStreaming.mRear); } - mCblk->server += stepCount; + mCblk->mServer += stepCount; size_t half = mFrameCount / 2; if (half == 0) { @@ -805,7 +805,7 @@ void StaticAudioTrackServerProxy::releaseBuffer(Buffer* buffer) } mPosition = newPosition; - cblk->server += stepCount; + cblk->mServer += stepCount; cblk->u.mStatic.mBufferPosition = newPosition; if (setFlags != 0) { (void) android_atomic_or(setFlags, &cblk->flags); |