Simplify enable/disable mixing
The MIXING enum isn't needed, and now returns void instead of status_t.
Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 7c7fa56..8996816 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -137,36 +137,22 @@
}
}
-status_t AudioMixer::enable(int name)
+void AudioMixer::enable()
{
- switch (name) {
- case MIXING: {
- if (mState.tracks[ mActiveTrack ].enabled != 1) {
- mState.tracks[ mActiveTrack ].enabled = 1;
- ALOGV("enable(%d)", mActiveTrack);
- invalidateState(1<<mActiveTrack);
- }
- } break;
- default:
- return NAME_NOT_FOUND;
+ if (mState.tracks[ mActiveTrack ].enabled != 1) {
+ mState.tracks[ mActiveTrack ].enabled = 1;
+ ALOGV("enable(%d)", mActiveTrack);
+ invalidateState(1<<mActiveTrack);
}
- return NO_ERROR;
}
-status_t AudioMixer::disable(int name)
+void AudioMixer::disable()
{
- switch (name) {
- case MIXING: {
- if (mState.tracks[ mActiveTrack ].enabled != 0) {
- mState.tracks[ mActiveTrack ].enabled = 0;
- ALOGV("disable(%d)", mActiveTrack);
- invalidateState(1<<mActiveTrack);
- }
- } break;
- default:
- return NAME_NOT_FOUND;
+ if (mState.tracks[ mActiveTrack ].enabled != 0) {
+ mState.tracks[ mActiveTrack ].enabled = 0;
+ ALOGV("disable(%d)", mActiveTrack);
+ invalidateState(1<<mActiveTrack);
}
- return NO_ERROR;
}
status_t AudioMixer::setActiveTrack(int track)