diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-05-04 17:18:16 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2011-06-01 13:50:23 -0700 |
| commit | 2225e4b7049fa3fb9d39a068b8268b63c952d7c1 (patch) | |
| tree | e4acaa9a05334d2e930677a5f5adf8314d1706c9 /media/jni/soundpool/SoundPool.cpp | |
| parent | 2978cef0a77550ea3a364ffbf42fc43f2029070e (diff) | |
| download | frameworks_base-2225e4b7049fa3fb9d39a068b8268b63c952d7c1.zip frameworks_base-2225e4b7049fa3fb9d39a068b8268b63c952d7c1.tar.gz frameworks_base-2225e4b7049fa3fb9d39a068b8268b63c952d7c1.tar.bz2 | |
Use AudioTrack::event_type not int in callback
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
Diffstat (limited to 'media/jni/soundpool/SoundPool.cpp')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 3ea13a6..d975079 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -682,14 +682,14 @@ void SoundChannel::nextEvent() play(sample, nextChannelID, leftVolume, rightVolume, priority, loop, rate); } -void SoundChannel::callback(int event, void* user, void *info) +void SoundChannel::callback(AudioTrack::event_type event, void* user, void *info) { SoundChannel* channel = static_cast<SoundChannel*>((void *)((unsigned long)user & ~1)); channel->process(event, info, (unsigned long)user & 1); } -void SoundChannel::process(int event, void *info, unsigned long toggle) +void SoundChannel::process(AudioTrack::event_type event, void *info, unsigned long toggle) { //LOGV("process(%d)", mChannelID); |