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 | 5a4ab16eba0a3c9749e0179b005475dfaaafacb5 (patch) | |
| tree | e384557fa652857cc4f3dd675e54df52215f0f8b /include | |
| parent | 682dbafc8f6c90281303e225c5d58d4e5f74fc09 (diff) | |
| parent | c85ca5d6b573e1a663a10950578220b4580c285c (diff) | |
| download | frameworks_base-5a4ab16eba0a3c9749e0179b005475dfaaafacb5.zip frameworks_base-5a4ab16eba0a3c9749e0179b005475dfaaafacb5.tar.gz frameworks_base-5a4ab16eba0a3c9749e0179b005475dfaaafacb5.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 |