Merge "Use AudioTrack::event_type not int in callback"

10 files changed, 15 insertions, 14 deletions

diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index bd70dad..59d9869 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -127,7 +127,7 @@ jint android_media_translateErrorCode(int code) {
 
 
 // ----------------------------------------------------------------------------
-static void audioCallback(int event, void* user, void *info) {
+static void audioCallback(AudioTrack::event_type event, void* user, void *info) {
     if (event == AudioTrack::EVENT_MORE_DATA) {
         // set size to 0 to signal we're not using the callback to write more data
         AudioTrack::Buffer* pBuff = (AudioTrack::Buffer*)info;
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index df30e8c..4fc7f2d 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -99,7 +99,7 @@ public:
      *          - EVENT_BUFFER_END: unused.
      */
 
-    typedef void (*callback_t)(int event, void* user, void *info);
+    typedef void (*callback_t)(event_type event, void* user, void *info);
 
     /* Returns the minimum frame count required for the successful creation of
      * an AudioTrack object.
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index 1ad1f26..9da069c 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -270,7 +270,7 @@ private:
     unsigned int mProcessSize;  // Size of audio blocks generated at a time by audioCallback() (in PCM frames).
 
     bool initAudioTrack();
-    static void audioCallback(int event, void* user, void *info);
+    static void audioCallback(AudioTrack::event_type event, void* user, void *info);
     bool prepareWave();
     unsigned int numWaves(unsigned int segmentIdx);
     void clearWaveGens();
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h
index 0b79324..05493d0 100644
--- a/include/media/stagefright/AudioPlayer.h
+++ b/include/media/stagefright/AudioPlayer.h
@@ -18,6 +18,7 @@
 
 #define AUDIO_PLAYER_H_
 
+#include <media/AudioTrack.h>
 #include <media/MediaPlayerInterface.h>
 #include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/TimeSource.h>
@@ -95,8 +96,8 @@ private:
     sp<MediaPlayerBase::AudioSink> mAudioSink;
     AwesomePlayer *mObserver;
 
-    static void AudioCallback(int event, void *user, void *info);
-    void AudioCallback(int event, void *info);
+    static void AudioCallback(AudioTrack::event_type event, void *user, void *info);
+    void AudioCallback(AudioTrack::event_type event, void *info);
 
     static size_t AudioSinkCallback(
             MediaPlayerBase::AudioSink *audioSink,
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;
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 9f1b3d6..913a6db 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -1076,7 +1076,7 @@ initAudioTrack_exit:
 //        returned value: always true.
 //
 ////////////////////////////////////////////////////////////////////////////////
-void ToneGenerator::audioCallback(int event, void* user, void *info) {
+void ToneGenerator::audioCallback(AudioTrack::event_type event, void* user, void *info) {
 
     if (event != AudioTrack::EVENT_MORE_DATA) return;
 
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index eae93ff..0676fcd 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1454,7 +1454,7 @@ status_t MediaPlayerService::AudioOutput::attachAuxEffect(int effectId)
 
 // static
 void MediaPlayerService::AudioOutput::CallbackWrapper(
-        int event, void *cookie, void *info) {
+        AudioTrack::event_type event, void *cookie, void *info) {
     //LOGV("callbackwrapper");
     if (event != AudioTrack::EVENT_MORE_DATA) {
         return;
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index 8bab471..573117c 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -103,7 +103,7 @@ class MediaPlayerService : public BnMediaPlayerService
     private:
         static void             setMinBufferCount();
         static void             CallbackWrapper(
-                int event, void *me, void *info);
+                AudioTrack::event_type event, void *me, void *info);
 
         AudioTrack*             mTrack;
         AudioCallback           mCallback;
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index dd69e6b..c2bacb7 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -249,7 +249,7 @@ void AudioPlayer::reset() {
 }
 
 // static
-void AudioPlayer::AudioCallback(int event, void *user, void *info) {
+void AudioPlayer::AudioCallback(AudioTrack::event_type event, void *user, void *info) {
     static_cast<AudioPlayer *>(user)->AudioCallback(event, info);
 }
 
@@ -275,7 +275,7 @@ size_t AudioPlayer::AudioSinkCallback(
     return me->fillBuffer(buffer, size);
 }
 
-void AudioPlayer::AudioCallback(int event, void *info) {
+void AudioPlayer::AudioCallback(AudioTrack::event_type event, void *info) {
     if (event != AudioTrack::EVENT_MORE_DATA) {
         return;
     }