summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrackShared.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-24 16:13:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-24 16:13:51 +0000
commitf0002d142e6d24c5438600b2c259679de710f8ac (patch)
tree20e5013fa14f2d5339868c1b08396f7b852a2123 /media/libmedia/AudioTrackShared.cpp
parentc69b91ceae6255e41c5413796fb0ed4f7af45b15 (diff)
parent74935e44734c1ec235c2b6677db3e0dbefa5ddb8 (diff)
downloadframeworks_av-f0002d142e6d24c5438600b2c259679de710f8ac.zip
frameworks_av-f0002d142e6d24c5438600b2c259679de710f8ac.tar.gz
frameworks_av-f0002d142e6d24c5438600b2c259679de710f8ac.tar.bz2
Merge "Replace control block frameCount_ by explicit in/out parameter"
Diffstat (limited to 'media/libmedia/AudioTrackShared.cpp')
-rw-r--r--media/libmedia/AudioTrackShared.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp
index 7a1e207..21018a0 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()
- : mServer(0), frameCount_(0), mFutex(0), mMinimum(0),
+ : mServer(0), mFutex(0), mMinimum(0),
mVolumeLR(0x10001000), mSampleRate(0), mSendLevel(0), mFlags(0)
{
memset(&u, 0, sizeof(u));