diff options
| author | Mathias Agopian <mathias@google.com> | 2011-07-29 17:55:48 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-08-01 14:06:20 -0700 |
| commit | 982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27 (patch) | |
| tree | 2a5036e97e04b0467eab8f73a283f0a0730c0d61 /media/libmedia/mediaplayer.cpp | |
| parent | 03116780a17cb6db7c926d01630cb9f68a19539b (diff) | |
| download | frameworks_base-982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27.zip frameworks_base-982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27.tar.gz frameworks_base-982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27.tar.bz2 | |
connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.
Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index a11fb80..3dd9249 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -201,11 +201,11 @@ status_t MediaPlayer::getMetadata(bool update_only, bool apply_filter, Parcel *m void MediaPlayer::disconnectNativeWindow() { if (mConnectedWindow != NULL) { - status_t err = native_window_disconnect(mConnectedWindow.get(), + status_t err = native_window_api_disconnect(mConnectedWindow.get(), NATIVE_WINDOW_API_MEDIA); if (err != OK) { - LOGW("native_window_disconnect returned an error: %s (%d)", + LOGW("native_window_api_disconnect returned an error: %s (%d)", strerror(-err), err); } } @@ -224,7 +224,7 @@ status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface) } if (surface != NULL) { - status_t err = native_window_connect(surface.get(), + status_t err = native_window_api_connect(surface.get(), NATIVE_WINDOW_API_MEDIA); if (err != OK) { @@ -274,7 +274,7 @@ status_t MediaPlayer::setVideoSurfaceTexture( sp<ANativeWindow> anw; if (surfaceTexture != NULL) { anw = new SurfaceTextureClient(surfaceTexture); - status_t err = native_window_connect(anw.get(), + status_t err = native_window_api_connect(anw.get(), NATIVE_WINDOW_API_MEDIA); if (err != OK) { |