commit f8860bf3592debe89916aa49b7994a7deeee0df1
author Andreas Huber <andih@google.com> Fri Aug 27 13:44:14 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 27 13:44:14 2010 -0700
tree 49a161d232fab9b4abf7e208f9798c30f553be3c
parent 165dc4c486b8511402b3be508d5a577a774cdf59
parent 8d342970108926c4ea355c90d26a2a353ec0fd47

Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread

include/private/surfaceflinger/SharedBufferStack.h

diff --git a/include/private/surfaceflinger/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h
index d016dfa..d689667 100644
--- a/include/private/surfaceflinger/SharedBufferStack.h
+++ b/include/private/surfaceflinger/SharedBufferStack.h
@@ -151,7 +151,6 @@
     ~SharedBufferBase();
     status_t getStatus() const;
     int32_t getIdentity() const;
-    size_t getFrontBuffer() const;
     String8 dump(char const* prefix) const;
 
 protected:
@@ -226,6 +225,11 @@
         inline ssize_t operator()();
     };
 
+    struct DequeueUpdate : public UpdateBase {
+        inline DequeueUpdate(SharedBufferBase* sbb);
+        inline ssize_t operator()();
+    };
+
     struct UndoDequeueUpdate : public UpdateBase {
         inline UndoDequeueUpdate(SharedBufferBase* sbb);
         inline ssize_t operator()();