summaryrefslogtreecommitdiff
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@google.com> 2011-12-15 14:54:01 -0800
committer Glenn Kasten <gkasten@google.com> 2011-12-15 15:00:28 -0800
commitaf62dbca028583a95703c1305e2bcc050cdcb93f (patch)
tree9d3f5981853f1266a404121c74bddcf6d6ed9cae /services/audioflinger/AudioFlinger.cpp
parente61fd281a8cb69ae45c5de4b160ab86226083152 (diff)
Simplify enable/disable mixing
The MIXING enum isn't needed, and now returns void instead of status_t. Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index b48f23d900e9..dcc0bd0a0b4c 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2197,7 +2197,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
// XXX: these things DON'T need to be done each time
mAudioMixer->setBufferProvider(track);
- mAudioMixer->enable(AudioMixer::MIXING);
+ mAudioMixer->enable();
mAudioMixer->setParameter(param, AudioMixer::VOLUME0, (void *)left);
mAudioMixer->setParameter(param, AudioMixer::VOLUME1, (void *)right);
@@ -2243,7 +2243,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
mixerStatus = MIXER_TRACKS_ENABLED;
}
}
- mAudioMixer->disable(AudioMixer::MIXING);
+ mAudioMixer->disable();
}
}