diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-12-16 07:29:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-16 07:29:57 -0800 |
| commit | b87c068727a15a3d3f0bfdcb758c76a097f5e869 (patch) | |
| tree | 49768247c538c838564c4546bc55cb3df572b56f /services/audioflinger/AudioMixer.h | |
| parent | 255adceb85bc23de61fb138ddb474852514b3b33 (diff) | |
| parent | 1c48c3c61970527b97892ab6a2daae8eaac26964 (diff) | |
| download | frameworks_av-b87c068727a15a3d3f0bfdcb758c76a097f5e869.zip frameworks_av-b87c068727a15a3d3f0bfdcb758c76a097f5e869.tar.gz frameworks_av-b87c068727a15a3d3f0bfdcb758c76a097f5e869.tar.bz2 | |
Merge "Simplify enable/disable mixing"
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index da9e2b5..02722d7 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); |