diff options
| author | 2011-06-01 14:40:45 -0700 | |
|---|---|---|
| committer | 2011-06-01 14:40:45 -0700 | |
| commit | 0523c55e5fd31db06d78f742a79db94f21c2eece (patch) | |
| tree | cd148d8889fbbfdc89caf741d4b0470bcbcf8644 /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | 7ae03cda10eddbde0d992ec82b2d5dacaf6eb10f (diff) | |
| parent | 2225e4b7049fa3fb9d39a068b8268b63c952d7c1 (diff) | |
Merge "Use AudioTrack::event_type not int in callback"
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index eae93ff00bf1..0676fcd90906 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( - int event, void *cookie, void *info) { + AudioTrack::event_type event, void *cookie, void *info) { //LOGV("callbackwrapper"); if (event != AudioTrack::EVENT_MORE_DATA) { return; |