diff options
author | Glenn Kasten <gkasten@google.com> | 2011-12-19 15:06:39 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2011-12-20 16:29:21 -0800 |
commit | 9c56d4ae6212c21ce5fd71ed534eb195983a07c1 (patch) | |
tree | 417c958c4fd243f4edb7bc765f4dc1e709456ddc /services/audioflinger/AudioMixer.h | |
parent | bbaf8673f1d1dd79d1b7f474ca7111da58e84aff (diff) | |
download | frameworks_av-9c56d4ae6212c21ce5fd71ed534eb195983a07c1.zip frameworks_av-9c56d4ae6212c21ce5fd71ed534eb195983a07c1.tar.gz frameworks_av-9c56d4ae6212c21ce5fd71ed534eb195983a07c1.tar.bz2 |
Remove the notion of "active track" from mixer
This is a first step towards making the mixer more object-oriented.
Change-Id: Ifd445d0e471023a7f5c82e934736ffc95ba1b05b
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r-- | services/audioflinger/AudioMixer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 39af103..45365be 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -47,7 +47,7 @@ public: enum { // names - // track units (MAX_NUM_TRACKS units) + // track names (MAX_NUM_TRACKS units) TRACK0 = 0x1000, // 0x2000 is unused @@ -74,16 +74,16 @@ public: }; + // For all APIs with "name": TRACK0 <= name < TRACK0 + MAX_NUM_TRACKS int getTrackName(); void deleteTrackName(int name); - void enable(); - void disable(); + void enable(int name); + void disable(int name); - void setActiveTrack(int track); - void setParameter(int target, int name, void *value); + void setParameter(int name, int target, int param, void *value); - void setBufferProvider(AudioBufferProvider* bufferProvider); + void setBufferProvider(int name, AudioBufferProvider* bufferProvider); void process(); uint32_t trackNames() const { return mTrackNames; } @@ -178,7 +178,7 @@ private: track_t tracks[MAX_NUM_TRACKS]; __attribute__((aligned(32))); }; - int mActiveTrack; + // bitmask of allocated track names, where bit 0 corresponds to TRACK0 etc. uint32_t mTrackNames; const uint32_t mSampleRate; |