diff options
| author | John Grossman <johngro@google.com> | 2012-02-21 12:00:45 -0800 |
|---|---|---|
| committer | John Grossman <johngro@google.com> | 2012-02-23 09:29:51 -0800 |
| commit | fa4a191d0d68c5f83fff5024d383f6a8dcd136c9 (patch) | |
| tree | babc95fa5ae0d20fa2a4bd55c71361c77715068e /include/media | |
| parent | af88907d0e94335826bc88f20ba3dc0c92cdfafe (diff) | |
| download | frameworks_base-fa4a191d0d68c5f83fff5024d383f6a8dcd136c9.zip frameworks_base-fa4a191d0d68c5f83fff5024d383f6a8dcd136c9.tar.gz frameworks_base-fa4a191d0d68c5f83fff5024d383f6a8dcd136c9.tar.bz2 | |
Revert "Add a way to play file descriptor data sources using the A@H transmitter media player."
This reverts commit 64006cb1642b2ec0ee74c66007d869b884391fd1.
Back out this change in order to get ready to implement a longer term,
more media-team approved way of selecting a retransmit player.
Change-Id: I97b68b9859a174eab858598cb00d4445a14fbc17
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/IMediaPlayer.h | 1 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h index afd4f58..e905903 100644 --- a/include/media/IMediaPlayer.h +++ b/include/media/IMediaPlayer.h @@ -58,7 +58,6 @@ public: virtual status_t attachAuxEffect(int effectId) = 0; virtual status_t setParameter(int key, const Parcel& request) = 0; virtual status_t getParameter(int key, Parcel* reply) = 0; - virtual status_t setMediaPlayerType(int playerType) = 0; // Invoke a generic method on the player by using opaque parcels // for the request and reply. diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index ed42ee9..e6a0cc5 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -201,7 +201,6 @@ public: status_t attachAuxEffect(int effectId); status_t setParameter(int key, const Parcel& request); status_t getParameter(int key, Parcel* reply); - status_t setMediaPlayerType(int playerType); private: void clear_l(); @@ -232,8 +231,6 @@ private: int mVideoHeight; int mAudioSessionId; float mSendLevel; - bool mOverridePlayerType; - int mOverridePlayerTypeValue; }; }; // namespace android |