diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-09-06 10:15:30 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-06 10:15:31 -0700 |
commit | 56cd317a35a18ba5c40b344f0a5bf436546246a1 (patch) | |
tree | 2c3eb9ae3389801959a7679b354f0abb66d8d1b6 /media/libmediaplayerservice | |
parent | 3e2e7a945cf0239b2f021294fc9786958f389ef9 (diff) | |
parent | ced24b36bbeed1ddd086a9304a9639c04ffe0962 (diff) | |
download | frameworks_av-56cd317a35a18ba5c40b344f0a5bf436546246a1.zip frameworks_av-56cd317a35a18ba5c40b344f0a5bf436546246a1.tar.gz frameworks_av-56cd317a35a18ba5c40b344f0a5bf436546246a1.tar.bz2 |
Merge "Update remote display API." into jb-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 4 | ||||
-rw-r--r-- | media/libmediaplayerservice/RemoteDisplay.cpp | 2 | ||||
-rw-r--r-- | media/libmediaplayerservice/RemoteDisplay.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 9005500..423d6ce 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -283,7 +283,7 @@ sp<ICrypto> MediaPlayerService::makeCrypto() { sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay( const sp<IRemoteDisplayClient>& client, const String8& iface) { - return new RemoteDisplay(client, iface.string());; + return new RemoteDisplay(client, iface.string()); } status_t MediaPlayerService::enableRemoteDisplay(const char *iface) { @@ -299,7 +299,7 @@ status_t MediaPlayerService::enableRemoteDisplay(const char *iface) { } if (mRemoteDisplay != NULL) { - mRemoteDisplay->disconnect(); + mRemoteDisplay->dispose(); mRemoteDisplay.clear(); } diff --git a/media/libmediaplayerservice/RemoteDisplay.cpp b/media/libmediaplayerservice/RemoteDisplay.cpp index 1cc605e..5542bb5 100644 --- a/media/libmediaplayerservice/RemoteDisplay.cpp +++ b/media/libmediaplayerservice/RemoteDisplay.cpp @@ -39,7 +39,7 @@ RemoteDisplay::RemoteDisplay( RemoteDisplay::~RemoteDisplay() { } -status_t RemoteDisplay::disconnect() { +status_t RemoteDisplay::dispose() { mSource->stop(); mLooper->stop(); diff --git a/media/libmediaplayerservice/RemoteDisplay.h b/media/libmediaplayerservice/RemoteDisplay.h index 63c5286..0d87250 100644 --- a/media/libmediaplayerservice/RemoteDisplay.h +++ b/media/libmediaplayerservice/RemoteDisplay.h @@ -33,7 +33,7 @@ struct WifiDisplaySource; struct RemoteDisplay : public BnRemoteDisplay { RemoteDisplay(const sp<IRemoteDisplayClient> &client, const char *iface); - virtual status_t disconnect(); + virtual status_t dispose(); protected: virtual ~RemoteDisplay(); |