From e6a8c10d3d6d652c0325d965a87494faa84b1aca Mon Sep 17 00:00:00 2001
From: Patrik Ryd <patrik.ryd@linaro.org>
Date: Wed, 16 May 2012 16:38:50 +0200
Subject: Revert "changes for awesomeplayer"

This reverts commit 06d0b9b37d168dd0520398057373116018d94c2a.
---
 media/libstagefright/AwesomePlayer.cpp       | 9 ---------
 media/libstagefright/include/AwesomePlayer.h | 2 --
 2 files changed, 11 deletions(-)
 mode change 100755 => 100644 media/libstagefright/AwesomePlayer.cpp
 mode change 100755 => 100644 media/libstagefright/include/AwesomePlayer.h

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
old mode 100755
new mode 100644
index f5ecd6909961..1b4f79f89d69
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1141,18 +1141,9 @@ bool AwesomePlayer::isPlaying() const {
     return (mFlags & PLAYING) || (mFlags & CACHE_UNDERRUN);
 }
 
-status_t AwesomePlayer::setSurface(const sp<Surface> &surface) {
-    Mutex::Autolock autoLock(mLock);
-
-    mSurface = surface;
-    return setNativeWindow_l(surface);
-}
-
 status_t AwesomePlayer::setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture) {
     Mutex::Autolock autoLock(mLock);
 
-    mSurface.clear();
-
     status_t err;
     if (surfaceTexture != NULL) {
         err = setNativeWindow_l(new SurfaceTextureClient(surfaceTexture));
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h
old mode 100755
new mode 100644
index d9c54e1a9dea..0985f479d561
--- a/media/libstagefright/include/AwesomePlayer.h
+++ b/media/libstagefright/include/AwesomePlayer.h
@@ -81,7 +81,6 @@ struct AwesomePlayer {
 
     bool isPlaying() const;
 
-    status_t setSurface(const sp<Surface> &surface);
     status_t setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture);
     void setAudioSink(const sp<MediaPlayerBase::AudioSink> &audioSink);
     status_t setLooping(bool shouldLoop);
@@ -154,7 +153,6 @@ private:
     bool mUIDValid;
     uid_t mUID;
 
-    sp<Surface> mSurface;
     sp<ANativeWindow> mNativeWindow;
     sp<MediaPlayerBase::AudioSink> mAudioSink;
 
-- 
cgit v1.2.3