diff options
author | Glenn Kasten <gkasten@google.com> | 2012-04-12 09:39:07 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-04-16 17:43:58 -0700 |
commit | 4e2293f29f2e719af1245d365747ea06d074b345 (patch) | |
tree | d07878412ffeca6ccd4e7e4bbbc0b4fb68370a59 /services/audioflinger/AudioMixer.cpp | |
parent | 99a80e10f2d0e88c0509a298bdd1df0308b55a7b (diff) | |
download | frameworks_av-4e2293f29f2e719af1245d365747ea06d074b345.zip frameworks_av-4e2293f29f2e719af1245d365747ea06d074b345.tar.gz frameworks_av-4e2293f29f2e719af1245d365747ea06d074b345.tar.bz2 |
AudioMixer new cmd: remove sample rate converter
Add a new command REMOVE to remove any sample rate converter
on a track, without having to delete the track name.
Add comments.
Remove some dead code.
Fix whitespace and comparison to NULL.
Change-Id: Id55a23ab5ee673189e99675b4e6fa5df7b617987
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 05fa3b9..100f289 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -327,15 +327,9 @@ void AudioMixer::deleteTrackName(int name) track.enabled = false; invalidateState(1<<name); } - if (track.resampler != NULL) { - // delete the resampler - delete track.resampler; - track.resampler = NULL; - track.sampleRate = mSampleRate; - invalidateState(1<<name); - } - track.volumeInc[0] = 0; - track.volumeInc[1] = 0; + // delete the resampler + delete track.resampler; + track.resampler = NULL; mTrackNames &= ~(1<<name); } @@ -439,6 +433,12 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) track.resetResampler(); invalidateState(1 << name); break; + case REMOVE: + delete track.resampler; + track.resampler = NULL; + track.sampleRate = mSampleRate; + invalidateState(1 << name); + break; default: LOG_FATAL("bad param"); } @@ -499,7 +499,7 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) bool AudioMixer::track_t::setResampler(uint32_t value, uint32_t devSampleRate) { - if (value!=devSampleRate || resampler) { + if (value != devSampleRate || resampler != NULL) { if (sampleRate != value) { sampleRate = value; if (resampler == NULL) { |