diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-15 01:06:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-15 01:06:13 -0700 |
| commit | a25f0fcebaa9fcb550ae2ccd5913085ae48b1018 (patch) | |
| tree | 03d588be86210a6beef49967e02ba91c7d94d005 /media | |
| parent | 2b50fba2b143c2e0597c941d67bea1b8e80c9caf (diff) | |
| parent | b07c28b90b2d2793be2b8878d813b607f3eebbb7 (diff) | |
| download | frameworks_av-a25f0fcebaa9fcb550ae2ccd5913085ae48b1018.zip frameworks_av-a25f0fcebaa9fcb550ae2ccd5913085ae48b1018.tar.gz frameworks_av-a25f0fcebaa9fcb550ae2ccd5913085ae48b1018.tar.bz2 | |
Merge change 7067
* changes:
add a ctor to Mutex to specify the type, which can be shared. This is used by sf and af an soon will allow some optimization in the kernel for non shared mutexes
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index af7dae5..7b9eda7 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -891,7 +891,7 @@ void AudioTrack::AudioTrackThread::onFirstRef() // ========================================================================= audio_track_cblk_t::audio_track_cblk_t() - : user(0), server(0), userBase(0), serverBase(0), buffers(0), frameCount(0), + : lock(Mutex::SHARED), user(0), server(0), userBase(0), serverBase(0), buffers(0), frameCount(0), loopStart(UINT_MAX), loopEnd(UINT_MAX), loopCount(0), volumeLR(0), flowControlFlag(1), forceReady(0) { } |