diff options
| 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 |
| commit | af62dbca028583a95703c1305e2bcc050cdcb93f (patch) | |
| tree | 9d3f5981853f1266a404121c74bddcf6d6ed9cae /services/audioflinger/AudioMixer.cpp | |
| parent | e61fd281a8cb69ae45c5de4b160ab86226083152 (diff) | |
| download | frameworks_base-af62dbca028583a95703c1305e2bcc050cdcb93f.zip frameworks_base-af62dbca028583a95703c1305e2bcc050cdcb93f.tar.gz frameworks_base-af62dbca028583a95703c1305e2bcc050cdcb93f.tar.bz2 | |
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/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 34 |
1 files changed, 10 insertions, 24 deletions
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 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate) } } -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) |