diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-06-01 15:20:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 15:20:35 -0700 |
| commit | d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f (patch) | |
| tree | 36ea6300b9a3e5412d45ddaa5e5d6a38117c30c0 /include/media | |
| parent | 013b5a67d6f8e12a1b06e74863daec1bee4d99c1 (diff) | |
| download | frameworks_av-d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f.zip frameworks_av-d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f.tar.gz frameworks_av-d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f.tar.bz2 | |
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
Diffstat (limited to 'include/media')
| -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 |
3 files changed, 4 insertions, 5 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, |