commit d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f
author Glenn Kasten <gkasten@google.com> Wed Jun 01 15:20:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 15:20:35 2011 -0700
tree 36ea6300b9a3e5412d45ddaa5e5d6a38117c30c0
parent 013b5a67d6f8e12a1b06e74863daec1bee4d99c1

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

This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1

media/libmedia/ToneGenerator.cpp

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 @@
 //        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;
 

media/libmediaplayerservice/MediaPlayerService.cpp

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 @@
 
 // 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;

media/libmediaplayerservice/MediaPlayerService.h

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 @@
     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;

media/libstagefright/AudioPlayer.cpp

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 @@
 }
 
 // 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 @@
     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;
     }