From d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 1 Jun 2011 15:20:35 -0700 Subject: Revert "Use AudioTrack::event_type not int in callback" This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1 --- include/media/AudioTrack.h | 2 +- include/media/ToneGenerator.h | 2 +- include/media/stagefright/AudioPlayer.h | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'include/media') diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 4fc7f2d..df30e8c 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -99,7 +99,7 @@ public: * - EVENT_BUFFER_END: unused. */ - typedef void (*callback_t)(event_type event, void* user, void *info); + typedef void (*callback_t)(int 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 9da069c..1ad1f26 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(AudioTrack::event_type event, void* user, void *info); + static void audioCallback(int 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 05493d0..0b79324 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -18,7 +18,6 @@ #define AUDIO_PLAYER_H_ -#include #include #include #include @@ -96,8 +95,8 @@ private: sp mAudioSink; AwesomePlayer *mObserver; - static void AudioCallback(AudioTrack::event_type event, void *user, void *info); - void AudioCallback(AudioTrack::event_type event, void *info); + static void AudioCallback(int event, void *user, void *info); + void AudioCallback(int event, void *info); static size_t AudioSinkCallback( MediaPlayerBase::AudioSink *audioSink, -- cgit v1.1