commit 73ca0f5837d5448f7a5eb159a09cd0ebe82b4de9
author Glenn Kasten <gkasten@google.com> Wed Feb 29 07:56:15 2012 -0800
committer Glenn Kasten <gkasten@google.com> Wed Feb 29 11:49:50 2012 -0800
tree c998f3102cf0b63133726cd80f051901b4a2be15
parent 8b20e9272d2f8d5160494de3212d66a399b3637f

Pull in declaration of effectChains to inner block

Change-Id: I09eacf72124942abd604132b9f4e774b1236fcf3

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 36df2c0..ddca941 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2012,7 +2012,6 @@
     uint32_t sleepTime = idleSleepTime;
 
     uint32_t sleepTimeShift = 0;
-    Vector< sp<EffectChain> > effectChains;
     CpuStats cpuStats;
 
     // DirectOutputThread has shorter standbyDelay
@@ -2025,6 +2024,8 @@
 
         // DirectOutputThread has rampVolume, leftVol, rightVol
 
+        Vector< sp<EffectChain> > effectChains;
+
         processConfigEvents();
 
         mixer_state mixerStatus = MIXER_IDLE;
@@ -2200,6 +2201,9 @@
         // Effect chains will be actually deleted here if they were removed from
         // mEffectChains list during mixing or effects processing
         effectChains.clear();
+
+        // FIXME Note that the above .clear() is no longer necessary since effectChains
+        // is now local to this block, but will keep it for now (at least until merge done).
     }
 
     // put output stream into standby mode
@@ -3022,6 +3026,9 @@
         // Effect chains will be actually deleted here if they were removed from
         // mEffectChains list during mixing or effects processing
         effectChains.clear();
+
+        // FIXME Note that the above .clear() is no longer necessary since effectChains
+        // is now local to this block, but will keep it for now (at least until merge done).
     }
 
     // put output stream into standby mode
@@ -3158,7 +3165,6 @@
     uint32_t activeSleepTime = activeSleepTimeUs();
     uint32_t idleSleepTime = idleSleepTimeUs();
     uint32_t sleepTime = idleSleepTime;
-    Vector< sp<EffectChain> > effectChains;
 
     acquireWakeLock();
 
@@ -3166,6 +3172,8 @@
     {
         // MixerThread has cpuStats.sample
 
+        Vector< sp<EffectChain> > effectChains;
+
         processConfigEvents();
 
         mixer_state mixerStatus = MIXER_IDLE;
@@ -3302,6 +3310,9 @@
         // Effect chains will be actually deleted here if they were removed from
         // mEffectChains list during mixing or effects processing
         effectChains.clear();
+
+        // FIXME Note that the above .clear() is no longer necessary since effectChains
+        // is now local to this block, but will keep it for now (at least until merge done).
     }
 
     // MixerThread and DirectOutpuThread have standby here,