summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-12-15 14:54:01 -0800
committerGlenn Kasten <gkasten@google.com>2011-12-15 15:00:28 -0800
commit1c48c3c61970527b97892ab6a2daae8eaac26964 (patch)
tree24fed87db69fcce3fb6f3b01bb72501445102c04 /services/audioflinger/AudioMixer.h
parenteebeceec684a36222b4559e3157b0db04c0a67ed (diff)
downloadframeworks_av-1c48c3c61970527b97892ab6a2daae8eaac26964.zip
frameworks_av-1c48c3c61970527b97892ab6a2daae8eaac26964.tar.gz
frameworks_av-1c48c3c61970527b97892ab6a2daae8eaac26964.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.h')
-rw-r--r--services/audioflinger/AudioMixer.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index 75c9170..0dc918d 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -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);