commit d4513b09123deebf8023b73a82d2d46d35806cea
author Glenn Kasten <gkasten@google.com> Tue Mar 06 15:52:35 2012 -0800
committer Glenn Kasten <gkasten@google.com> Wed Mar 07 10:40:43 2012 -0800
tree bff4d188e7d9cbf5b5b542ac555f7b406e1ba46d
parent 1465f0c3df04c3166155a852a6a5c10069c1fd0a

Make applyVolume private to DirectOutputThread

Change-Id: I7ca4a59505857cbd106b6f274c66e9580dead271

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 8deb2fe..fe068af 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2166,14 +2166,6 @@
 
         // only process effects if we're going to write
         if (sleepTime == 0) {
-
-            if (mixerStatus == MIXER_TRACKS_READY) {
-
-                // Non-trivial for DIRECT only
-                applyVolume();
-
-            }
-
             for (size_t i = 0; i < effectChains.size(); i ++) {
                 effectChains[i]->process_l();
             }
@@ -2999,6 +2991,7 @@
     }
     sleepTime = 0;
     standbyTime = systemTime() + standbyDelay;
+    applyVolume();
 }
 
 void AudioFlinger::DirectOutputThread::threadLoop_sleepTime()