diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-07-18 15:18:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-18 15:18:43 -0700 |
| commit | 4a621e6d3438876eb1d9001719c688a2329ee675 (patch) | |
| tree | 10398f8db30ff9b7debc46edfb713037318669a6 /include | |
| parent | 5f05b87b673093064e64bb5ac532555f881f0ddc (diff) | |
| parent | 61c7ef5bde2c7ed94a078396aa65da67b47e5402 (diff) | |
| download | frameworks_av-4a621e6d3438876eb1d9001719c688a2329ee675.zip frameworks_av-4a621e6d3438876eb1d9001719c688a2329ee675.tar.gz frameworks_av-4a621e6d3438876eb1d9001719c688a2329ee675.tar.bz2 | |
Merge "MediaPlayer: add ANativeWindow (dis)connect calls"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/mediaplayer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index ea5a9d3..1136f6c 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -25,6 +25,8 @@ #include <utils/KeyedVector.h> #include <utils/String8.h> +class ANativeWindow; + namespace android { class Surface; @@ -196,6 +198,8 @@ private: status_t prepareAsync_l(); status_t getDuration_l(int *msec); status_t setDataSource(const sp<IMediaPlayer>& player); + void disconnectNativeWindow(); + status_t reset_l(); sp<IMediaPlayer> mPlayer; thread_id_t mLockThreadId; @@ -218,6 +222,8 @@ private: int mVideoHeight; int mAudioSessionId; float mSendLevel; + sp<ANativeWindow> mConnectedWindow; + sp<IBinder> mConnectedWindowBinder; }; }; // namespace android |