diff options
author | Glenn Kasten <gkasten@google.com> | 2012-01-05 08:20:10 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 08:20:10 -0800 |
commit | 88592eccaf6afcddd5f985955be92fe25205c680 (patch) | |
tree | 5a1795bd7aefe20d332f7388d8cddcadc3df841a /services/audioflinger/AudioMixer.h | |
parent | a2a0a5d7d56baa831870f4bf2a0d942a477d92ef (diff) | |
parent | 9c56d4ae6212c21ce5fd71ed534eb195983a07c1 (diff) | |
download | frameworks_av-88592eccaf6afcddd5f985955be92fe25205c680.zip frameworks_av-88592eccaf6afcddd5f985955be92fe25205c680.tar.gz frameworks_av-88592eccaf6afcddd5f985955be92fe25205c680.tar.bz2 |
Merge "Remove the notion of "active track" from mixer"
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 9c129b8..4ba6845 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -42,7 +42,7 @@ public: enum { // names - // track units (MAX_NUM_TRACKS units) + // track names (MAX_NUM_TRACKS units) TRACK0 = 0x1000, // 0x2000 is unused @@ -69,16 +69,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; } @@ -171,7 +171,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; |