diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-12-16 07:30:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-16 07:30:14 -0800 |
| commit | 6d4bf6eda04888144ec59cba4816a2cbb79b9e5c (patch) | |
| tree | 213424db0d71f1de94ea2789d272595287664bf6 /services/audioflinger/AudioMixer.h | |
| parent | b87c068727a15a3d3f0bfdcb758c76a097f5e869 (diff) | |
| parent | fba380a0b2c62684ce4272a05165965bae29d6a1 (diff) | |
| download | frameworks_av-6d4bf6eda04888144ec59cba4816a2cbb79b9e5c.zip frameworks_av-6d4bf6eda04888144ec59cba4816a2cbb79b9e5c.tar.gz frameworks_av-6d4bf6eda04888144ec59cba4816a2cbb79b9e5c.tar.bz2 | |
Merge "setActiveTrack and setBufferProvider can't fail"
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 02722d7..f380b35 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -80,10 +80,10 @@ public: void enable(); void disable(); - status_t setActiveTrack(int track); + void setActiveTrack(int track); status_t setParameter(int target, int name, void *value); - status_t setBufferProvider(AudioBufferProvider* bufferProvider); + void setBufferProvider(AudioBufferProvider* bufferProvider); void process(); uint32_t trackNames() const { return mTrackNames; } |