diff options
| author | Dave Burke <daveburke@google.com> | 2011-08-30 14:39:17 +0100 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2011-09-02 11:26:59 +0100 |
| commit | d681bbb1767bed09415e050ba78975df214bcd68 (patch) | |
| tree | 2030c617c61bbf7b6cd8c6bafab601a99b1ac83d /include/media/mediaplayer.h | |
| parent | d942202ee0c92608c648735c3ad0f1bab4312420 (diff) | |
| download | frameworks_av-d681bbb1767bed09415e050ba78975df214bcd68.zip frameworks_av-d681bbb1767bed09415e050ba78975df214bcd68.tar.gz frameworks_av-d681bbb1767bed09415e050ba78975df214bcd68.tar.bz2 | |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
Diffstat (limited to 'include/media/mediaplayer.h')
| -rw-r--r-- | include/media/mediaplayer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 1a67671..e98d55c 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -21,6 +21,7 @@ #include <media/IMediaPlayerClient.h> #include <media/IMediaPlayer.h> #include <media/IMediaDeathNotifier.h> +#include <media/IStreamSource.h> #include <utils/KeyedVector.h> #include <utils/String8.h> @@ -168,6 +169,7 @@ public: const KeyedVector<String8, String8> *headers); status_t setDataSource(int fd, int64_t offset, int64_t length); + status_t setDataSource(const sp<IStreamSource> &source); status_t setVideoSurface(const sp<Surface>& surface); status_t setVideoSurfaceTexture( const sp<ISurfaceTexture>& surfaceTexture); @@ -206,7 +208,7 @@ private: status_t seekTo_l(int msec); status_t prepareAsync_l(); status_t getDuration_l(int *msec); - status_t setDataSource(const sp<IMediaPlayer>& player); + status_t attachNewPlayer(const sp<IMediaPlayer>& player); void disconnectNativeWindow(); status_t reset_l(); |