diff options
| -rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
| -rw-r--r-- | include/media/ToneGenerator.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 5 | ||||
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 4 |
7 files changed, 9 insertions, 10 deletions
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 <media/AudioTrack.h> #include <media/MediaPlayerInterface.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/TimeSource.h> @@ -96,8 +95,8 @@ private: sp<MediaPlayerBase::AudioSink> 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, 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; } |