From e46a86fcb6a0849fc05c4cade6cb94aad0325295 Mon Sep 17 00:00:00 2001
From: Glenn Kasten <gkasten@google.com>
Date: Wed, 1 Jun 2011 15:20:35 -0700
Subject: Revert "Use AudioTrack::event_type not int in callback"

This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
---
 media/jni/soundpool/SoundPool.cpp                  | 4 ++--
 media/jni/soundpool/SoundPool.h                    | 4 ++--
 media/libmedia/ToneGenerator.cpp                   | 2 +-
 media/libmediaplayerservice/MediaPlayerService.cpp | 2 +-
 media/libmediaplayerservice/MediaPlayerService.h   | 2 +-
 media/libstagefright/AudioPlayer.cpp               | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'media')

diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index d975079..3ea13a6 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(AudioTrack::event_type event, void* user, void *info)
+void SoundChannel::callback(int 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(AudioTrack::event_type event, void *info, unsigned long toggle)
+void SoundChannel::process(int 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 0f92378..6010aac 100644
--- a/media/jni/soundpool/SoundPool.h
+++ b/media/jni/soundpool/SoundPool.h
@@ -141,8 +141,8 @@ public:
     void dump();
 
 private:
-    static void callback(AudioTrack::event_type event, void* user, void *info);
-    void process(AudioTrack::event_type event, void *info, unsigned long toggle);
+    static void callback(int event, void* user, void *info);
+    void process(int event, void *info, unsigned long toggle);
     bool doStop_l();
 
     SoundPool*          mSoundPool;
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 913a6db..9f1b3d6 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -1076,7 +1076,7 @@ initAudioTrack_exit:
 //        returned value: always true.
 //
 ////////////////////////////////////////////////////////////////////////////////
-void ToneGenerator::audioCallback(AudioTrack::event_type event, void* user, void *info) {
+void ToneGenerator::audioCallback(int 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 0676fcd..eae93ff 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(
-        AudioTrack::event_type event, void *cookie, void *info) {
+        int 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 573117c..8bab471 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(
-                AudioTrack::event_type event, void *me, void *info);
+                int event, void *me, void *info);
 
         AudioTrack*             mTrack;
         AudioCallback           mCallback;
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index c2bacb7..dd69e6b 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -249,7 +249,7 @@ void AudioPlayer::reset() {
 }
 
 // static
-void AudioPlayer::AudioCallback(AudioTrack::event_type event, void *user, void *info) {
+void AudioPlayer::AudioCallback(int 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(AudioTrack::event_type event, void *info) {
+void AudioPlayer::AudioCallback(int event, void *info) {
     if (event != AudioTrack::EVENT_MORE_DATA) {
         return;
     }
-- 
cgit v1.1