summaryrefslogtreecommitdiffstats
path: root/media/jni/soundpool
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-05-04 17:18:16 -0700
committerGlenn Kasten <gkasten@google.com>2011-06-01 13:50:23 -0700
commit2225e4b7049fa3fb9d39a068b8268b63c952d7c1 (patch)
treee4acaa9a05334d2e930677a5f5adf8314d1706c9 /media/jni/soundpool
parent2978cef0a77550ea3a364ffbf42fc43f2029070e (diff)
downloadframeworks_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')
-rw-r--r--media/jni/soundpool/SoundPool.cpp4
-rw-r--r--media/jni/soundpool/SoundPool.h4
2 files changed, 4 insertions, 4 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);
diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h
index 6010aac..0f92378 100644
--- a/media/jni/soundpool/SoundPool.h
+++ b/media/jni/soundpool/SoundPool.h
@@ -141,8 +141,8 @@ public:
void dump();
private:
- static void callback(int event, void* user, void *info);
- void process(int event, void *info, unsigned long toggle);
+ static void callback(AudioTrack::event_type event, void* user, void *info);
+ void process(AudioTrack::event_type event, void *info, unsigned long toggle);
bool doStop_l();
SoundPool* mSoundPool;