From c3da3434cb57f47284ea06bb9065eaa2fe033efb Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 29 Jul 2011 17:55:48 -0700 Subject: 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 --- media/libmedia/mediaplayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'media/libmedia/mediaplayer.cpp') 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) } 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 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) { -- cgit v1.1