commit 3ab8d66ad1c47a5ee1f87ad9f5ee2666cf89b32d
author Glenn Kasten <gkasten@google.com> Mon Apr 03 14:35:09 2017 -0700
committer Glenn Kasten <gkasten@google.com> Fri Apr 07 14:46:29 2017 -0700
tree 4e0b0664033e13a14ad1c05652b7ccded31ee87c
parent 8ae038e457b0b01c4f082ff5504f8b880b087f77

Rename symbols to be more consistent

Bug: 37153050
Test: builds OK
Change-Id: I7e55a03ca8e1f22901db6c8f6f2ad32e4c95a0cd

media/libaudioclient/include/AudioMixer.h

diff --git a/media/libaudioclient/include/AudioMixer.h b/media/libaudioclient/include/AudioMixer.h
index 87ada76..2bd2d01 100644
--- a/media/libaudioclient/include/AudioMixer.h
+++ b/media/libaudioclient/include/AudioMixer.h
@@ -286,7 +286,7 @@
         process_hook_t  hook;   // one of process__*, never NULL
         int32_t         *outputTemp;
         int32_t         *resampleTemp;
-        NBLog::Writer*  mLog;
+        NBLog::Writer*  mNBLogWriter;   // associated NBLog::Writer or &mDummyLog
         int32_t         reserved[1];
         // FIXME allocate dynamically to save some memory when maxNumTracks < MAX_NUM_TRACKS
         track_t         tracks[MAX_NUM_TRACKS] __attribute__((aligned(32)));
@@ -301,9 +301,11 @@
 
     const uint32_t  mSampleRate;
 
-    NBLog::Writer   mDummyLog;
+    NBLog::Writer   mDummyLogWriter;
 public:
-    void            setLog(NBLog::Writer* log);
+    // Called by FastMixer to inform AudioMixer of it's associated NBLog::Writer.
+    // FIXME It would be safer to use TLS for this, so we don't accidentally use wrong one.
+    void            setNBLogWriter(NBLog::Writer* log);
 private:
     state_t         mState __attribute__((aligned(32)));