Merge "Remove the notion of "active track" from mixer"

diff --cc services/audioflinger/AudioFlinger.cpp
Simple merge

diff --cc services/audioflinger/AudioMixer.cpp
index d994a87,3b2771b..c9c61a5
--- 1/services/audioflinger/AudioMixer.cpp
--- 2/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@@ -330,27 -329,12 +330,29 @@@ void AudioMixer::track_t::adjustVolumeR
      }
  }
  
 +size_t AudioMixer::track_t::getUnreleasedFrames()
 +{
 +    if (resampler != NULL) {
 +        return resampler->getUnreleasedFrames();
 +    }
 +    return 0;
 +}
 +
 +size_t AudioMixer::getUnreleasedFrames(int name)
 +{
 +    name -= TRACK0;
 +    if (uint32_t(name) < MAX_NUM_TRACKS) {
 +        track_t& track(mState.tracks[name]);
 +        return track.getUnreleasedFrames();
 +    }
 +    return 0;
 +}
  
- void AudioMixer::setBufferProvider(AudioBufferProvider* buffer)
+ void AudioMixer::setBufferProvider(int name, AudioBufferProvider* buffer)
  {
-     mState.tracks[ mActiveTrack ].bufferProvider = buffer;
+     name -= TRACK0;
+     assert(uint32_t(name) < MAX_NUM_TRACKS);
+     mState.tracks[name].bufferProvider = buffer;
  }
  
  

diff --cc services/audioflinger/AudioMixer.h
Simple merge