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

services/audioflinger/FastMixer.cpp

diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index 103e7f8..b4502b2 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -101,10 +101,12 @@
     return mSQ.poll();
 }
 
-void FastMixer::setLog(NBLog::Writer *logWriter)
+void FastMixer::setNBLogWriter(NBLog::Writer *logWriter)
 {
+    // FIXME If mMixer is set or changed prior to this, we don't inform correctly.
+    //       Should cache logWriter and re-apply it at the assignment to mMixer.
     if (mMixer != NULL) {
-        mMixer->setLog(logWriter);
+        mMixer->setNBLogWriter(logWriter);
     }
 }
 
@@ -188,6 +190,7 @@
             //       implementation; it would be better to have normal mixer allocate for us
             //       to avoid blocking here and to prevent possible priority inversion
             mMixer = new AudioMixer(frameCount, mSampleRate, FastMixerState::sMaxFastTracks);
+            // FIXME See the other FIXME at FastMixer::setNBLogWriter()
             const size_t mixerFrameSize = mSinkChannelCount
                     * audio_bytes_per_sample(mMixerBufferFormat);
             mMixerBufferSize = mixerFrameSize * frameCount;