From 013b5a67d6f8e12a1b06e74863daec1bee4d99c1 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 4 May 2011 17:18:16 -0700 Subject: Use AudioTrack::event_type not int in callback Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c --- include/media/AudioTrack.h | 2 +- include/media/ToneGenerator.h | 2 +- include/media/stagefright/AudioPlayer.h | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'include') 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 #include #include #include @@ -95,8 +96,8 @@ private: sp 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, -- cgit v1.1