diff options
| author | Andreas Huber <andih@google.com> | 2010-09-28 12:02:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-28 12:02:35 -0700 |
| commit | 6fd2b44b156c4ef28e131183f0fe8f7dcecfcc6e (patch) | |
| tree | d5313827aae770a8d4cef80b43c7030d8cb1f159 /include/media | |
| parent | 8211da9eabe28037ebcc23bbfbbe20cb21cb0cdc (diff) | |
| parent | ed54ad0f8619ae416b0968ade6248894cbfc4dba (diff) | |
| download | frameworks_av-6fd2b44b156c4ef28e131183f0fe8f7dcecfcc6e.zip frameworks_av-6fd2b44b156c4ef28e131183f0fe8f7dcecfcc6e.tar.gz frameworks_av-6fd2b44b156c4ef28e131183f0fe8f7dcecfcc6e.tar.bz2 | |
Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 9a09586..ed2f7d7 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -27,6 +27,7 @@ namespace android { class MediaSource; class AudioTrack; +class AwesomePlayer; class AudioPlayer : public TimeSource { public: @@ -35,7 +36,9 @@ public: SEEK_COMPLETE }; - AudioPlayer(const sp<MediaPlayerBase::AudioSink> &audioSink); + AudioPlayer(const sp<MediaPlayerBase::AudioSink> &audioSink, + AwesomePlayer *audioObserver = NULL); + virtual ~AudioPlayer(); // Caller retains ownership of "source". @@ -91,6 +94,7 @@ private: MediaBuffer *mFirstBuffer; sp<MediaPlayerBase::AudioSink> mAudioSink; + AwesomePlayer *mObserver; static void AudioCallback(int event, void *user, void *info); void AudioCallback(int event, void *info); |