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/libmediaplayerservice | |
| 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/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 |
2 files changed, 2 insertions, 2 deletions
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; |