commit d054c32443a493513ab63529b0c8b1aca290278c
author Glenn Kasten <gkasten@google.com> Fri Jul 12 12:59:20 2013 -0700
committer Glenn Kasten <gkasten@google.com> Tue Jul 30 09:50:48 2013 -0700
tree fc68ba259ded1dd4960bee2938a9bcc7c599c9a3
parent 96f60d8f04432a1ed503b3e24d5736d28c63c9a2

Move control block mName to createTrack() output

This is part of a series of CLs to clean up the shared memory
control block, by removing any fields that don't have to be there.

Change-Id: I6e51003a1293b6800258c31b22cff2eba42162e7

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 64a59be..dd0ec73 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -953,6 +953,7 @@
                                                       output,
                                                       tid,
                                                       &mSessionId,
+                                                      mName,
                                                       &status);
 
     if (track == 0) {
@@ -1183,8 +1184,8 @@
     if (mState == STATE_ACTIVE) {
         audio_track_cblk_t* cblk = mCblk;
         if (android_atomic_and(~CBLK_DISABLED, &cblk->mFlags) & CBLK_DISABLED) {
-            ALOGW("releaseBuffer() track %p name=%#x disabled due to previous underrun, restarting",
-                    this, cblk->mName);
+            ALOGW("releaseBuffer() track %p name=%s disabled due to previous underrun, restarting",
+                    this, mName.string());
             // FIXME ignoring status
             mAudioTrack->start();
         }