Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify enable/disable mixing

Browse Source 
The MIXING enum isn't needed, and now returns void instead of status_t.

Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
This commit is contained in:
Glenn Kasten
2011-12-15 14:54:01 -08:00
parent e61fd281a8
commit af62dbca02
3 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/audioflinger/AudioFlinger.cpp
View File

@@ -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();
}
}

34
services/audioflinger/AudioMixer.cpp
View File

@@ -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)

7
services/audioflinger/AudioMixer.h
View File

@@ -50,8 +50,7 @@ public:
// track units (32 units)
TRACK0 = 0x1000,
// enable/disable
MIXING = 0x2000,
// 0x2000 is unused
// setParameter targets
TRACK = 0x3000,
@@ -78,8 +77,8 @@ public:
int getTrackName();
void deleteTrackName(int name);
status_t enable(int name);
status_t disable(int name);
void enable();
void disable();
status_t setActiveTrack(int track);
status_t setParameter(int target, int name, void *value);