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 /media/libstagefright/AudioPlayer.cpp | |
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 'media/libstagefright/AudioPlayer.cpp')
-rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |